diff options
-rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala | 19 | ||||
-rw-r--r-- | test/files/pos/t5667.scala | 6 |
2 files changed, 19 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala b/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala index 7dc105690c..cf94f7d4d6 100644 --- a/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala +++ b/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala @@ -234,11 +234,16 @@ trait MethodSynthesis { // TODO: need to shuffle annotations between wrapper and class. val wrapper = ImplicitClassWrapper(cd) val meth = wrapper.derivedSym - val mdef = context.unit.synthetics(meth) - context.unit.synthetics -= meth - meth setAnnotations deriveAnnotations(annotations, MethodTargetClass, false) - cd.symbol setAnnotations deriveAnnotations(annotations, ClassTargetClass, true) - List(cd, mdef) + context.unit.synthetics get meth match { + case Some(mdef) => + context.unit.synthetics -= meth + meth setAnnotations deriveAnnotations(annotations, MethodTargetClass, false) + cd.symbol setAnnotations deriveAnnotations(annotations, ClassTargetClass, true) + List(cd, mdef) + case _ => + // Shouldn't happen, but let's give ourselves a reasonable error when it does + abort("No synthetics for " + meth + ": synthetics contains " + context.unit.synthetics.keys.mkString(", ")) + } case _ => List(stat) } @@ -373,7 +378,9 @@ trait MethodSynthesis { def completer(sym: Symbol): Type = ??? // not needed def createAndEnterSymbol(): Symbol = enterSyntheticSym(derivedTree) def derivedSym: Symbol = { - val result = enclClass.info decl name + // Only methods will do! Don't want to pick up any stray + // companion objects of the same name. + val result = enclClass.info decl name suchThat (_.isMethod) assert(result != NoSymbol, "not found: "+name+" in "+enclClass+" "+enclClass.info.decls) result } diff --git a/test/files/pos/t5667.scala b/test/files/pos/t5667.scala new file mode 100644 index 0000000000..513de5b663 --- /dev/null +++ b/test/files/pos/t5667.scala @@ -0,0 +1,6 @@ +object Main { + implicit class C(val s: String) extends AnyVal + implicit class C2(val s: String) extends AnyRef + + implicit case class Foo(i: Int) +} |