File tree Expand file tree Collapse file tree 2 files changed +4
-7
lines changed
src/compiler/scala/tools/nsc/backend/jvm Expand file tree Collapse file tree 2 files changed +4
-7
lines changed Original file line number Diff line number Diff line change @@ -856,12 +856,11 @@ abstract class BCodeBodyBuilder extends BCodeSkelBuilder {
856
856
}
857
857
858
858
def genLoadModule (tree : Tree ): BType = {
859
- // Working around SI-5604. Rather than failing the compile when we see a package here, check if there's a package object.
860
859
val module = (
861
860
if (! tree.symbol.isPackageClass) tree.symbol
862
861
else tree.symbol.info.member(nme.PACKAGE ) match {
863
- case NoSymbol => abort(s " Cannot use package as value: $tree" ) ; NoSymbol
864
- case s => devWarning( " Bug : found package class where package object expected. Converting. " ) ; s.moduleClass
862
+ case NoSymbol => abort(s " SI-5604: Cannot use package as value: $tree" )
863
+ case s => abort( s " SI-5604 : found package class where package object expected: $tree " )
865
864
}
866
865
)
867
866
lineNumber(tree)
Original file line number Diff line number Diff line change @@ -440,13 +440,11 @@ abstract class BCodeHelpers extends BCodeTypes with BytecodeWriters {
440
440
if (sym0 == definitions.NullClass ) return RT_NULL ;
441
441
if (sym0 == definitions.NothingClass ) return RT_NOTHING ;
442
442
443
- // Working around SI-5604. Rather than failing the compile when we see
444
- // a package here, check if there's a package object.
445
443
val sym = (
446
444
if (! sym0.isPackageClass) sym0
447
445
else sym0.info.member(nme.PACKAGE ) match {
448
- case NoSymbol => abort(s " Cannot use package as value: ${sym0.fullName}" )
449
- case s => devWarning( " Bug : found package class where package object expected. Converting. " ) ; s.moduleClass
446
+ case NoSymbol => abort(s " SI-5604: Cannot use package as value: ${sym0.fullName}" )
447
+ case s => abort( s " SI-5604 : found package class where package object expected: $s " )
450
448
}
451
449
)
452
450
You can’t perform that action at this time.
0 commit comments