Merge pull request #841 from magarciaEPFL/fixes

final touches to GenASM to become default JVM backend in M5

4 files changed, 28 insertions, 13 deletions

diff --git a/src/compiler/scala/tools/ant/Scalac.scala b/src/compiler/scala/tools/ant/Scalac.scala
index a34692f5e0..e70716885e 100644
--- a/src/compiler/scala/tools/ant/Scalac.scala
+++ b/src/compiler/scala/tools/ant/Scalac.scala
@@ -99,7 +99,7 @@ class Scalac extends ScalaMatchingTask with ScalacShared {
 
   /** Defines valid values for the `target` property. */
   object Target extends PermissibleValue {
-    val values = List("jvm-1.5", "msil")
+    val values = List("jvm-1.5", "jvm-1.6", "jvm-1.7", "msil")
   }
 
   /** Defines valid values for the `deprecation` and `unchecked` properties. */
diff --git a/src/compiler/scala/tools/nsc/backend/JavaPlatform.scala b/src/compiler/scala/tools/nsc/backend/JavaPlatform.scala
index 62885cc73d..80b0f640a4 100644
--- a/src/compiler/scala/tools/nsc/backend/JavaPlatform.scala
+++ b/src/compiler/scala/tools/nsc/backend/JavaPlatform.scala
@@ -44,7 +44,7 @@ trait JavaPlatform extends Platform {
     else List(dependencyAnalysis)
 
   private def classEmitPhase =
-    if (settings.target.value == "jvm-1.5") genJVM
+    if (settings.target.value == "jvm-1.5-fjbg") genJVM
     else genASM
 
   def platformPhases = List(
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala
index 5ab8a3d751..32c100b026 100644
--- a/src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala
+++ b/src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala
@@ -780,6 +780,12 @@ abstract class GenASM extends SubComponent with BytecodeWriters {
   /** functionality for building plain and mirror classes */

   abstract class JCommonBuilder(wuQ: WorkUnitQueue, needsOutfileForSymbol: Boolean) extends JBuilder(wuQ, needsOutfileForSymbol) {

 

+    def debugLevel = settings.debuginfo.indexOfChoice

+

+    val emitSource = debugLevel >= 1

+    val emitLines  = debugLevel >= 2

+    val emitVars   = debugLevel >= 3

+

     // -----------------------------------------------------------------------------------------

     // more constants

     // -----------------------------------------------------------------------------------------

@@ -1427,8 +1433,10 @@ abstract class GenASM extends SubComponent with BytecodeWriters {
       // typestate: entering mode with valid call sequences:

       //   [ visitSource ] [ visitOuterClass ] ( visitAnnotation | visitAttribute )*

 

-      jclass.visitSource(c.cunit.source.toString,

-                         null /* SourceDebugExtension */)

+      if(emitSource) {

+        jclass.visitSource(c.cunit.source.toString,

+                           null /* SourceDebugExtension */)

+      }

 

       val enclM = getEnclosingMethodAttribute()

       if(enclM != null) {

@@ -1556,12 +1564,6 @@ abstract class GenASM extends SubComponent with BytecodeWriters {
       jfield.visitEnd()

     }

 

-    def debugLevel = settings.debuginfo.indexOfChoice

-

-    // val emitSource = debugLevel >= 1

-    val emitLines  = debugLevel >= 2

-    val emitVars   = debugLevel >= 3

-

     var method:  IMethod = _

     var jmethod: asm.MethodVisitor = _

     var jMethodName: String = _

@@ -1940,6 +1942,15 @@ abstract class GenASM extends SubComponent with BytecodeWriters {
           i += 1

         }

 

+        // check for duplicate keys to avoid "VerifyError: unsorted lookupswitch" (SI-6011)

+        i = 1

+        while (i < keys.length) {

+          if(keys(i-1) == keys(i)) {

+            abort("duplicate keys in SWITCH, can't pick arbitrarily one of them to evict, see SI-6011.")

+          }

+          i += 1

+        }

+

         val keyMin = keys(0)

         val keyMax = keys(keys.length - 1)

 

@@ -2957,8 +2968,10 @@ abstract class GenASM extends SubComponent with BytecodeWriters {
       // typestate: entering mode with valid call sequences:

       //   [ visitSource ] [ visitOuterClass ] ( visitAnnotation | visitAttribute )*

 

-      mirrorClass.visitSource("" + cunit.source,

-                              null /* SourceDebugExtension */)

+      if(emitSource) {

+        mirrorClass.visitSource("" + cunit.source,

+                                null /* SourceDebugExtension */)

+      }

 

       val ssa = getAnnotPickle(mirrorName, modsym.companionSymbol)

       mirrorClass.visitAttribute(if(ssa.isDefined) pickleMarkerLocal else pickleMarkerForeign)

diff --git a/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala
index 1bb0948168..f0ee8b11f3 100644
--- a/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala
+++ b/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala
@@ -40,7 +40,9 @@ trait StandardScalaSettings {
   val nowarn =         BooleanSetting ("-nowarn", "Generate no warnings.")
   val optimise:        BooleanSetting // depends on post hook which mutates other settings
   val print =          BooleanSetting ("-print", "Print program with Scala-specific features removed.")
-  val target =          ChoiceSetting ("-target", "target", "Target platform for object files.", List("jvm-1.5", "jvm-1.5-asm", "jvm-1.6", "jvm-1.7", "msil"), "jvm-1.5")
+  val target =          ChoiceSetting ("-target", "target", "Target platform for object files.",
+                                       List("jvm-1.5", "jvm-1.5-fjbg", "jvm-1.5-asm", "jvm-1.6", "jvm-1.7", "msil"),
+                                       "jvm-1.5-asm")
   val unchecked =      BooleanSetting ("-unchecked", "Enable detailed unchecked (erasure) warnings.")
   val uniqid =         BooleanSetting ("-uniqid", "Uniquely tag all identifiers in debugging output.")
   val usejavacp =      BooleanSetting ("-usejavacp", "Utilize the java.class.path in classpath resolution.")