File tree Expand file tree Collapse file tree 2 files changed +6
-1
lines changed
src/dotty/tools/dotc/core Expand file tree Collapse file tree 2 files changed +6
-1
lines changed Original file line number Diff line number Diff line change @@ -510,6 +510,9 @@ object StdNames {
510
510
val wrap : N = " wrap"
511
511
val zero : N = " zero"
512
512
val zip : N = " zip"
513
+ val nothingRuntimeClass : N = " scala.runtime.Nothing$"
514
+ val nullRuntimeClass : N = " scala.runtime.Null$"
515
+
513
516
514
517
val synthSwitch : N = " $synthSwitch"
515
518
Original file line number Diff line number Diff line change @@ -875,7 +875,9 @@ class ClassfileParser(
875
875
val start = starts(index)
876
876
if (in.buf(start).toInt != CONSTANT_CLASS ) errorBadTag(start)
877
877
val name = getExternalName(in.getChar(start + 1 ))
878
- if (name.isModuleClassName) c = ctx.requiredModule(name.sourceModuleName)
878
+ if (name.isModuleClassName && (name ne nme.nothingRuntimeClass) && (name ne nme.nullRuntimeClass))
879
+ // Null$ and Nothing$ ARE classes
880
+ c = ctx.requiredModule(name.sourceModuleName)
879
881
else c = classNameToSymbol(name)
880
882
values(index) = c
881
883
}
You can’t perform that action at this time.
0 commit comments