diff options
author | Miguel Garcia <miguelalfredo.garcia@epfl.ch> | 2012-03-06 14:20:13 +0100 |
---|---|---|
committer | Miguel Garcia <miguelalfredo.garcia@epfl.ch> | 2012-03-06 14:20:13 +0100 |
commit | d7e485d5fe53b5ff3bb30b3fb12cf45238f04337 (patch) | |
tree | b70fcfb97cd01dc119a08d8125971a2c4f0c720a | |
parent | 483ecd96b9852ef9792d5d6acc0fd137eafe8929 (diff) | |
download | scala-d7e485d5fe53b5ff3bb30b3fb12cf45238f04337.tar.gz scala-d7e485d5fe53b5ff3bb30b3fb12cf45238f04337.tar.bz2 scala-d7e485d5fe53b5ff3bb30b3fb12cf45238f04337.zip |
readability
-rw-r--r-- | src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala index 0cdd9be20b..6d379a7cd0 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala @@ -274,10 +274,13 @@ abstract class GenJVM extends SubComponent with GenJVMUtil with GenAndroid with // TODO: some beforeFlatten { ... } which accounts for // being nested in parameterized classes (if we're going to selectively flatten.) val x = innerClassSymbolFor(s) - val isInner = x.isClass && !x.rawowner.isPackageClass - if (isInner) { - innerClassBuffer += x - collectInnerClass(x.rawowner) + if(x ne NoSymbol) { + assert(x.isClass, "not an inner-class symbol") + val isInner = !x.rawowner.isPackageClass + if (isInner) { + innerClassBuffer += x + collectInnerClass(x.rawowner) + } } } collectInnerClass(sym) |