Fixed optimiser bugs, now all tests pass when u...

Fixed optimiser bugs, now all tests pass when using the optimised
compiler.

4 files changed, 25 insertions, 4 deletions

diff --git a/src/compiler/scala/tools/nsc/backend/icode/Printers.scala b/src/compiler/scala/tools/nsc/backend/icode/Printers.scala
index 0bb634485c..4a5826e550 100644
--- a/src/compiler/scala/tools/nsc/backend/icode/Printers.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/Printers.scala
@@ -81,7 +81,7 @@ trait Printers { self: ICodes =>
 
     def printMethod(m: IMethod): Unit = {
       print("def "); print(m.symbol.name);
-      print("("); printList(printParam)(m.params.reverse, ", "); print(")");
+      print("("); printList(printParam)(m.params, ", "); print(")");
       print(": "); print(m.symbol.info.resultType);
 
       if (!m.isDeferred) {
diff --git a/src/compiler/scala/tools/nsc/backend/icode/analysis/CopyPropagation.scala b/src/compiler/scala/tools/nsc/backend/icode/analysis/CopyPropagation.scala
index 44b56dac79..9b9b58c39b 100644
--- a/src/compiler/scala/tools/nsc/backend/icode/analysis/CopyPropagation.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/analysis/CopyPropagation.scala
@@ -499,12 +499,29 @@ abstract class CopyPropagation {
       var values = in.stack.take(1 + ctor.info.paramTypes.length).reverse.drop(1);
       val bindings = new HashMap[Symbol, Value];
 
-      if (settings.debug.value) log("getBindings for: " + ctor)
+      if (settings.debug.value) log("getBindings for: " + ctor + " acc: " + paramAccessors)
+
+      var paramTypes = ctor.tpe.paramTypes
+      val diff = paramTypes.length - paramAccessors.length
+      diff match {
+        case 0 => ()
+        case 1 if ctor.tpe.paramTypes.head == ctor.owner.rawowner.tpe =>
+          // it's an unused outer
+          log("considering unused outer at position 0 in " + ctor.tpe.paramTypes)
+          paramTypes = paramTypes.tail
+          values = values.tail
+        case _ =>
+          log("giving up on " + ctor + "(diff: " + diff + ")")
+          return bindings
+      }
+
       // this relies on having the same order in paramAccessors and
       // the arguments on the stack. It should be the same!
       for ((p, i) <- paramAccessors.zipWithIndex) {
-//        assert(p.tpe == ctor.tpe.paramTypes(i), "In: " + ctor.fullNameString + " having: " + (paramAccessors map (_.tpe))+ " vs. " + ctor.tpe.paramTypes)
-        if (p.tpe == ctor.tpe.paramTypes(i))
+//        assert(p.tpe == paramTypes(i), "In: " + ctor.fullNameString
+//               + " having acc: " + (paramAccessors map (_.tpe))+ " vs. params" + paramTypes
+//               + "\n\t failed at pos " + i + " with " + p.tpe + " == " + paramTypes(i))
+        if (p.tpe == paramTypes(i))
           bindings += (p -> values.head);
         values = values.tail;
       }
diff --git a/src/compiler/scala/tools/nsc/backend/opt/ClosureElimination.scala b/src/compiler/scala/tools/nsc/backend/opt/ClosureElimination.scala
index a041fa76fb..9a777ae413 100644
--- a/src/compiler/scala/tools/nsc/backend/opt/ClosureElimination.scala
+++ b/src/compiler/scala/tools/nsc/backend/opt/ClosureElimination.scala
@@ -99,6 +99,7 @@ abstract class ClosureElimination extends SubComponent {
 
       for (bb <- linearizer.linearize(m)) {
         var info = cpp.in(bb)
+        log("Cpp info at entry to block " + bb + ": " + info)
 
         for (i <- bb.toList) {
           i match {
diff --git a/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala b/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala
index 62ae82797c..6cbfb8ce3a 100644
--- a/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala
+++ b/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala
@@ -149,6 +149,9 @@ abstract class Inliners extends SubComponent {
            case THIS(clasz) =>
              LOAD_LOCAL(inlinedThis);
 
+           case STORE_THIS(_) =>
+             STORE_LOCAL(inlinedThis)
+
            case JUMP(whereto) =>
              JUMP(inlinedBlock(whereto));