diff options
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala | 9 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/opt/Inliners.scala | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala index 69bfc75119..680f973f19 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala @@ -188,12 +188,9 @@ abstract class GenJVM extends SubComponent { addStaticInit(jclass) if (isTopLevelModule(c.symbol)) { - if (c.symbol.linkedClassOfModule == NoSymbol) { - if (c.symbol.owner.info.member(c.symbol.name.toTypeName) != NoSymbol) - println("Class with same name as " + c.symbol + " is defined in a different compilation unit") - else - dumpMirrorClass(c.symbol, c.cunit.source.toString); - } else + if (c.symbol.linkedClassOfModule == NoSymbol) + dumpMirrorClass(c.symbol, c.cunit.source.toString); + else log("No mirror class for module with linked class: " + c.symbol.fullNameString) } diff --git a/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala b/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala index daf12112e2..0b78779d20 100644 --- a/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala +++ b/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala @@ -288,7 +288,7 @@ abstract class Inliners extends SubComponent { if (m.code ne null) { if (settings.debug.value) log("Analyzing " + m + " count " + count); - tfa.reinit(m) + tfa.init(m) tfa.run for (bb <- linearizer.linearize(m)) { var info = tfa.in(bb); |