summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2013-12-13 10:17:27 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2013-12-13 10:17:27 -0800
commit637f239b19ded6b5a3b7b8c06fa64bb0a9f85578 (patch)
treef64e327a92e7f4a36ca928e1d7382d5aca9c1958 /src/compiler/scala/tools/nsc/typechecker/Contexts.scala
parent4371969ddca5c8711f4b973f84db5062d6103760 (diff)
parentb2b9cf4f8c8ff8a00d19aabd56f0602c2aced4b3 (diff)
downloadscala-637f239b19ded6b5a3b7b8c06fa64bb0a9f85578.tar.gz
scala-637f239b19ded6b5a3b7b8c06fa64bb0a9f85578.tar.bz2
scala-637f239b19ded6b5a3b7b8c06fa64bb0a9f85578.zip
Merge pull request #3214 from retronym/ticket/8024
SI-8024 Fix inaccurate message on overloaded ambiguous ident
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Contexts.scala')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Contexts.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
index 2b4417a80d..53bc9a2772 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
@@ -1126,7 +1126,7 @@ trait Contexts { self: Analyzer =>
impSym = NoSymbol
// Otherwise they are irreconcilably ambiguous
else
- return ambiguousDefnAndImport(defSym.owner, imp1)
+ return ambiguousDefnAndImport(defSym.alternatives.head.owner, imp1)
}
// At this point only one or the other of defSym and impSym might be set.