Merge pull request #4 from smarter/fix-inner-owner

DarkDimius · web-flow · commit 40bdc7b65a76 · 2017-01-11T12:53:32.000+01:00
Fix emission of outer name in InnerClass entries
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/BTypesFromSymbols.scala b/src/compiler/scala/tools/nsc/backend/jvm/BTypesFromSymbols.scala
@@ -163,7 +163,7 @@ class BTypesFromSymbols[I <: BackendInterface](val int: I) extends BTypes {
         } else {
           val outerName = innerClassSym.rawowner.javaBinaryName
           // Java compatibility. See the big comment in BTypes that summarizes the InnerClass spec.
-          val outerNameModule = if (innerClassSym.isTopLevelModuleClass) outerName.dropModule
+          val outerNameModule = if (innerClassSym.rawowner.isTopLevelModuleClass) outerName.dropModule
           else outerName
           Some(outerNameModule.toString)
         }

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ class BTypesFromSymbols[I <: BackendInterface](val int: I) extends BTypes {`
`163`	`163`	`} else {`
`164`	`164`	`val outerName = innerClassSym.rawowner.javaBinaryName`
`165`	`165`	`// Java compatibility. See the big comment in BTypes that summarizes the InnerClass spec.`
`166`		`- val outerNameModule = if (innerClassSym.isTopLevelModuleClass) outerName.dropModule`
	`166`	`+ val outerNameModule = if (innerClassSym.rawowner.isTopLevelModuleClass) outerName.dropModule`
`167`	`167`	`else outerName`
`168`	`168`	`Some(outerNameModule.toString)`
`169`	`169`	`}`