Fixing bugs introduced while porting.

ArrayClass is magical. Several methods had recursive implementation. PatternMatching was shadowing parameter.
scala · Nov 20, 2014 · de1efa9 · de1efa9 · scala-jenkins · Nov 20, 2014
1 parent 6783bec
commit de1efa9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala b/src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala
@@ -276,14 +276,15 @@ trait BCodeBodyBuilder extends BCodeSkelBuilder {
       tree match {
         case lblDf @ LabelDef(_, _, _) => genLabelDef(lblDf.asInstanceOf[LabelDef], expectedType)
 
-        case ValDef(_, nme_THIS, _, _) =>
+        case ValDef(_, `nme_THIS`, _, _) =>
           debuglog("skipping trivial assign to _$this: " + tree)
 
         case ValDef(_, _, _, rhs) =>
           val sym = tree.symbol
           /* most of the time, !locals.contains(sym), unless the current activation of genLoad() is being called
              while duplicating a finalizer that contains this ValDef. */
-          val Local(tk, _, idx, isSynth) = locals.getOrMakeLocal(sym)
+          val loc = locals.getOrMakeLocal(sym)
+          val Local(tk, _, idx, isSynth) = loc
           if (rhs == EmptyTree) { emitZeroOf(tk) }
           else { genLoad(rhs, tk) }
           val localVarStart = currProgramPoint()

diff --git a/src/compiler/scala/tools/nsc/backend/jvm/BackendInterface.scala b/src/compiler/scala/tools/nsc/backend/jvm/BackendInterface.scala
@@ -670,7 +670,7 @@ trait BackendInterfaceDefinitions { self: BackendInterface =>
   val Object_isInstanceOf: Symbol
   val Object_asInstanceOf: Symbol
   val Object_equals: Symbol
-
+  val ArrayClass: Symbol
 
   val UnitClass: Symbol
   val BooleanClass: Symbol
@@ -709,7 +709,7 @@ trait BackendInterfaceDefinitions { self: BackendInterface =>
   val JavaSerializableClass: Symbol = requiredClass[java.io.Serializable]
   val SerializableClass: Symbol = requiredClass[scala.Serializable]
   val ClassCastExceptionClass: Symbol = requiredClass[java.lang.ClassCastException]
-  val ArrayClass: Symbol = requiredClass[scala.Array[_]]
+
   val ClassfileAnnotationClass: Symbol = requiredClass[scala.annotation.ClassfileAnnotation]
   val BoxedNumberClass: Symbol = requiredClass[java.lang.Number]
   val RemoteExceptionClass: Symbol = requiredClass[java.rmi.RemoteException]

diff --git a/src/compiler/scala/tools/nsc/backend/jvm/ScalacBackendInterface.scala b/src/compiler/scala/tools/nsc/backend/jvm/ScalacBackendInterface.scala
@@ -127,6 +127,8 @@ class ScalacBackendInterface[G <: Global](val global: G) extends BackendInterfac
   val FloatClass: Symbol = global.definitions.FloatClass
   val DoubleClass: Symbol  = global.definitions.DoubleClass
 
+
+  val ArrayClass: Symbol = global.definitions.ArrayClass
   val NothingClass: Symbol = global.definitions.NothingClass
   val NullClass: Symbol = global.definitions.NullClass
   val ObjectClass: Symbol = global.definitions.ObjectClass
@@ -903,7 +905,7 @@ class ScalacBackendInterface[G <: Global](val global: G) extends BackendInterfac
   trait ScalacNameHelper extends NameHelper{
     val n: Name
     import global.AnyNameOps
-    def offset: Int = n.offset
+    def offset: Int = n.start
 
     def toTypeName: Name = n.toTypeName
 
@@ -913,7 +915,7 @@ class ScalacBackendInterface[G <: Global](val global: G) extends BackendInterfac
 
     def dropModule: Name = AnyNameOps(n).dropModule
 
-    def len: Int = n.len
+    def len: Int = n.length
 
     def isTermName: Boolean = n.isTermName