diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-17 01:18:30 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-17 01:18:30 -0700 |
| commit | 1e68d3b521cc968fa0ad1ef535d1ac0abcaa024d (patch) | |
| tree | 870874beb02ccf3f4b0fb43e9d42d4f686e8af5f | |
| parent | 8271c80ec0f01b031a82f27f17bb1b561691681f (diff) | |
| parent | 6559722330786dd26cc86b554296d5cb23eeb912 (diff) | |
| download | scala-1e68d3b521cc968fa0ad1ef535d1ac0abcaa024d.tar.gz scala-1e68d3b521cc968fa0ad1ef535d1ac0abcaa024d.tar.bz2 scala-1e68d3b521cc968fa0ad1ef535d1ac0abcaa024d.zip | |
Merge pull request #914 from paulp/issue/6072
Closes SI-6072, crasher with overloaded eq.
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/Mixin.scala | 2 | ||||
| -rw-r--r-- | test/files/pos/t6072.scala | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/Mixin.scala b/src/compiler/scala/tools/nsc/transform/Mixin.scala index fe5bef5009..930a7b34ce 100644 --- a/src/compiler/scala/tools/nsc/transform/Mixin.scala +++ b/src/compiler/scala/tools/nsc/transform/Mixin.scala @@ -868,7 +868,7 @@ abstract class Mixin extends InfoTransform with ast.TreeDSL { rhs match { case Block(List(assign), returnTree) => val Assign(moduleVarRef, _) = assign - val cond = Apply(Select(moduleVarRef, nme.eq), List(NULL)) + val cond = Apply(Select(moduleVarRef, Object_eq), List(NULL)) mkFastPathBody(clazz, moduleSym, cond, List(assign), List(NULL), returnTree, attrThis, args) case _ => assert(false, "Invalid getter " + rhs + " for module in class " + clazz) diff --git a/test/files/pos/t6072.scala b/test/files/pos/t6072.scala new file mode 100644 index 0000000000..e25ebbffc5 --- /dev/null +++ b/test/files/pos/t6072.scala @@ -0,0 +1,3 @@ +class A { + object B { def eq(lvl: Int) = ??? } +} |