removing defensive code made obsolete by existing fix to SI-5604

SI-5604 was fixed in commit e6f10b07d44f0ddde26246b4a41527a84eede81c

2 files changed, 4 insertions, 7 deletions

diff --git a/src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala b/src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala
index 72d8d0a00f..af5ae97b15 100644
--- a/src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala
+++ b/src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala
@@ -856,12 +856,11 @@ abstract class BCodeBodyBuilder extends BCodeSkelBuilder {
     }
 
     def genLoadModule(tree: Tree): BType = {
-      // Working around SI-5604.  Rather than failing the compile when we see a package here, check if there's a package object.
       val module = (
         if (!tree.symbol.isPackageClass) tree.symbol
         else tree.symbol.info.member(nme.PACKAGE) match {
-          case NoSymbol => abort(s"Cannot use package as value: $tree") ; NoSymbol
-          case s        => devWarning("Bug: found package class where package object expected.  Converting.") ; s.moduleClass
+          case NoSymbol => abort(s"SI-5604: Cannot use package as value: $tree")
+          case s        => abort(s"SI-5604: found package class where package object expected: $tree")
         }
       )
       lineNumber(tree)
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/BCodeHelpers.scala b/src/compiler/scala/tools/nsc/backend/jvm/BCodeHelpers.scala
index 7a5615648d..6b1bb5b220 100644
--- a/src/compiler/scala/tools/nsc/backend/jvm/BCodeHelpers.scala
+++ b/src/compiler/scala/tools/nsc/backend/jvm/BCodeHelpers.scala
@@ -440,13 +440,11 @@ abstract class BCodeHelpers extends BCodeTypes with BytecodeWriters {
         if (sym0 == definitions.NullClass)    return RT_NULL;
         if (sym0 == definitions.NothingClass) return RT_NOTHING;
 
-        // Working around SI-5604.  Rather than failing the compile when we see
-        // a package here, check if there's a package object.
         val sym = (
           if (!sym0.isPackageClass) sym0
           else sym0.info.member(nme.PACKAGE) match {
-            case NoSymbol => abort(s"Cannot use package as value: ${sym0.fullName}")
-            case s        => devWarning("Bug: found package class where package object expected.  Converting.") ; s.moduleClass
+            case NoSymbol => abort(s"SI-5604: Cannot use package as value: ${sym0.fullName}")
+            case s        => abort(s"SI-5604: found package class where package object expected: $s")
           }
         )