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

SI-5604 was fixed in e6f10b0

Author: magarciaEPFL

src/compiler/scala/tools/nsc/backend/icode/GenICode.scala

@@ -1122,15 +1122,11 @@ abstract class GenICode extends SubComponent  {
       }
 
     private def genLoadModule(ctx: Context, tree: Tree): Context = {
-      // 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 (!tree.symbol.isPackageClass) tree.symbol
         else tree.symbol.info.member(nme.PACKAGE) match {
           case NoSymbol => abort("Cannot use package as value: " + tree)
-          case s        =>
-            devWarning(s"Found ${tree.symbol} where a package object is required. Converting to ${s.moduleClass}")
-            s.moduleClass
+          case s        => abort(s"Found ${tree.symbol} where a package object is required.")
         }
       )
       debuglog("LOAD_MODULE from %s: %s".format(tree.shortClass, sym))

src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala

@@ -859,12 +859,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 s        => abort("SI-5604: found package class where package object expected.  Converting.")
         }
       )
       lineNumber(tree)

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 s        => abort("SI-5604: found package class where package object expected.")
           }
         )