diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-03-10 11:01:06 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-03-10 11:01:06 -0700 |
| commit | 1c7daf40bfe529969aa423ae0d2fd454adb20acb (patch) | |
| tree | f6f88e640421125f6bf127debef677b9dd274d2a /src/compiler/scala/tools | |
| parent | cdac91ef7507831b795dc8124421dded82224e5f (diff) | |
| parent | 60aa5771ea92f91ed34778f90c04113e226d09ca (diff) | |
| download | scala-1c7daf40bfe529969aa423ae0d2fd454adb20acb.tar.gz scala-1c7daf40bfe529969aa423ae0d2fd454adb20acb.tar.bz2 scala-1c7daf40bfe529969aa423ae0d2fd454adb20acb.zip | |
Merge pull request #3607 from xeno-by/ticket/8367
SI-8367 revert SI-8192's change to primaryConstructor when isJavaDefined
Diffstat (limited to 'src/compiler/scala/tools')
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/Erasure.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/Erasure.scala b/src/compiler/scala/tools/nsc/transform/Erasure.scala index bd2f6f0018..e036035397 100644 --- a/src/compiler/scala/tools/nsc/transform/Erasure.scala +++ b/src/compiler/scala/tools/nsc/transform/Erasure.scala @@ -600,7 +600,7 @@ abstract class Erasure extends AddInterfaces if (tree.symbol == NoSymbol) { tree } else if (name == nme.CONSTRUCTOR) { - if (tree.symbol.owner == AnyValClass) tree.symbol = ObjectClass.info.decl(nme.CONSTRUCTOR) + if (tree.symbol.owner == AnyValClass) tree.symbol = ObjectClass.primaryConstructor tree } else if (tree.symbol == Any_asInstanceOf) adaptMember(atPos(tree.pos)(Select(qual, Object_asInstanceOf))) |