From f1c6714e22e70ecba2aa595bf592b916be82deb4 Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Thu, 12 Apr 2012 20:35:05 +0100
Subject: Fix for SI-5535.

---
 test/files/run/t5535.check | 20 ++++++++++++++++++++
 test/files/run/t5535.scala | 10 ++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 test/files/run/t5535.check
 create mode 100644 test/files/run/t5535.scala

(limited to 'test/files/run')

diff --git a/test/files/run/t5535.check b/test/files/run/t5535.check
new file mode 100644
index 0000000000..8da9829b78
--- /dev/null
+++ b/test/files/run/t5535.check
@@ -0,0 +1,20 @@
+Type in expressions to have them evaluated.
+Type :help for more information.
+
+scala> 
+
+scala> def h()(i: Int) = 1 + i
+h: ()(i: Int)Int
+
+scala> println(h()(5))
+6
+
+scala> val f = h() _
+f: Int => Int = <function1>
+
+scala> println(f(10))
+11
+
+scala> 
+
+scala> 
diff --git a/test/files/run/t5535.scala b/test/files/run/t5535.scala
new file mode 100644
index 0000000000..7bc12f3470
--- /dev/null
+++ b/test/files/run/t5535.scala
@@ -0,0 +1,10 @@
+import scala.tools.partest.ReplTest
+
+object Test extends ReplTest {
+  def code = """
+def h()(i: Int) = 1 + i
+println(h()(5))
+val f = h() _
+println(f(10))
+  """
+}
-- 
cgit v1.2.3


From 08505bd4ec1216be7913607b84e54942f9153329 Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Thu, 12 Apr 2012 20:57:11 +0100
Subject: Workaround for SI-5583.

Somehow type args to be applied arrive in the specialized subclass
where type args are no longer applicable.  Log and discard.
---
 .../tools/nsc/transform/SpecializeTypes.scala      | 22 +++++++++++++++-------
 test/files/run/t5583.check                         | 20 ++++++++++++++++++++
 test/files/run/t5583.scala                         | 11 +++++++++++
 3 files changed, 46 insertions(+), 7 deletions(-)
 create mode 100644 test/files/run/t5583.check
 create mode 100644 test/files/run/t5583.scala

(limited to 'test/files/run')

diff --git a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
index 12d2513756..b85ae26cf1 100644
--- a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
+++ b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
@@ -1327,7 +1327,7 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers {
             }
           } else super.transform(tree)
 
-        case TypeApply(Select(qual, name), targs)
+        case TypeApply(sel @ Select(qual, name), targs)
                 if (!specializedTypeVars(symbol.info).isEmpty && name != nme.CONSTRUCTOR) =>
           debuglog("checking typeapp for rerouting: " + tree + " with sym.tpe: " + symbol.tpe + " tree.tpe: " + tree.tpe)
           val qual1 = transform(qual)
@@ -1341,14 +1341,22 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers {
               val residualTargs = symbol.info.typeParams zip targs collect {
                 case (tvar, targ) if !env.contains(tvar) || !isPrimitiveValueClass(env(tvar).typeSymbol) => targ
               }
+              if (specMember.info.typeParams.isEmpty) {
+                // See SI-5583.  Don't know why it happens now if it didn't before.
+                if (residualTargs.nonEmpty)
+                  log("!!! Type args to be applied, but symbol says no parameters: " + ((specMember.defString, residualTargs)))
 
-              ifDebug(assert(residualTargs.length == specMember.info.typeParams.length,
-                "residual: %s, tparams: %s, env: %s".format(residualTargs, symbol.info.typeParams, env))
-              )
+                localTyper.typed(sel)
+              }
+              else {
+                ifDebug(assert(residualTargs.length == specMember.info.typeParams.length,
+                  "residual: %s, tparams: %s, env: %s".format(residualTargs, specMember.info.typeParams, env))
+                )
 
-              val tree1 = gen.mkTypeApply(Select(qual1, specMember), residualTargs)
-              debuglog("rewrote " + tree + " to " + tree1)
-              localTyper.typedOperator(atPos(tree.pos)(tree1)) // being polymorphic, it must be a method
+                val tree1 = gen.mkTypeApply(Select(qual1, specMember), residualTargs)
+                debuglog("rewrote " + tree + " to " + tree1)
+                localTyper.typedOperator(atPos(tree.pos)(tree1)) // being polymorphic, it must be a method
+              }
 
             case None => super.transform(tree)
           }
diff --git a/test/files/run/t5583.check b/test/files/run/t5583.check
new file mode 100644
index 0000000000..39b969fbe7
--- /dev/null
+++ b/test/files/run/t5583.check
@@ -0,0 +1,20 @@
+Type in expressions to have them evaluated.
+Type :help for more information.
+
+scala> 
+
+scala> var s = 0
+s: Int = 0
+
+scala> for (i <- 1 to 10) {s += i}
+
+scala> for (i <- 1 to 10) {s += i}
+
+scala> for (i <- 1 to 10) {s += i}
+
+scala> println(s)
+165
+
+scala> 
+
+scala> 
diff --git a/test/files/run/t5583.scala b/test/files/run/t5583.scala
new file mode 100644
index 0000000000..8561a5946f
--- /dev/null
+++ b/test/files/run/t5583.scala
@@ -0,0 +1,11 @@
+import scala.tools.partest.ReplTest
+
+object Test extends ReplTest {
+  def code = """
+var s = 0
+for (i <- 1 to 10) {s += i}
+for (i <- 1 to 10) {s += i}
+for (i <- 1 to 10) {s += i}
+println(s)
+  """
+}
-- 
cgit v1.2.3