From b3e8963c30de38a6d813640d58cbb1a0a00eba36 Mon Sep 17 00:00:00 2001
From: Iulian Dragos <jaguarul@gmail.com>
Date: Thu, 26 Aug 2010 13:28:37 +0000
Subject: Closes #3497.

---
 .../scala/tools/nsc/backend/ScalaPrimitives.scala  | 29 +++++++++++++---------
 .../tools/nsc/transform/SpecializeTypes.scala      |  4 +--
 2 files changed, 19 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/compiler/scala/tools/nsc/backend/ScalaPrimitives.scala b/src/compiler/scala/tools/nsc/backend/ScalaPrimitives.scala
index 0af482912d..b1be70a54c 100644
--- a/src/compiler/scala/tools/nsc/backend/ScalaPrimitives.scala
+++ b/src/compiler/scala/tools/nsc/backend/ScalaPrimitives.scala
@@ -580,17 +580,23 @@ abstract class ScalaPrimitives {
     import definitions._
     val code = getPrimitive(fun)
 
-    var elem: Type = null
-    tpe match {
-      case TypeRef(_, sym, _elem :: Nil)
-           if (sym == ArrayClass) => elem = _elem
-      case _ => ()
+    def elementType = atPhase(currentRun.typerPhase) {
+      val arrayParent = tpe :: tpe.parents find {
+        case TypeRef(_, sym, _elem :: Nil)
+             if (sym == ArrayClass) => true
+        case _ => false
+      }
+      if (arrayParent.isEmpty) {
+        println(fun.fullName + " : " + tpe :: tpe.baseTypeSeq.toList)
+      }
+      val TypeRef(_, _, elem :: Nil) = arrayParent.get
+      elem
     }
 
     code match {
 
       case APPLY =>
-        toTypeKind(elem) match {
+        toTypeKind(elementType) match {
           case BOOL    => ZARRAY_GET
           case BYTE    => BARRAY_GET
           case SHORT   => SARRAY_GET
@@ -601,11 +607,11 @@ abstract class ScalaPrimitives {
           case DOUBLE  => DARRAY_GET
           case REFERENCE(_) | ARRAY(_) => OARRAY_GET
           case _ =>
-            abort("Unexpected array element type: " + elem)
+            abort("Unexpected array element type: " + elementType)
         }
 
       case UPDATE =>
-        toTypeKind(elem) match {
+        toTypeKind(elementType) match {
           case BOOL    => ZARRAY_SET
           case BYTE    => BARRAY_SET
           case SHORT   => SARRAY_SET
@@ -616,12 +622,11 @@ abstract class ScalaPrimitives {
           case DOUBLE  => DARRAY_SET
           case REFERENCE(_) | ARRAY(_) => OARRAY_SET
           case _ =>
-            abort("Unexpected array element type: " + elem)
+            abort("Unexpected array element type: " + elementType)
         }
 
       case LENGTH =>
-        assert(elem != null)
-        toTypeKind(elem) match {
+        toTypeKind(elementType) match {
           case BOOL    => ZARRAY_LENGTH
           case BYTE    => BARRAY_LENGTH
           case SHORT   => SARRAY_LENGTH
@@ -632,7 +637,7 @@ abstract class ScalaPrimitives {
           case DOUBLE  => DARRAY_LENGTH
           case REFERENCE(_) | ARRAY(_) => OARRAY_LENGTH
           case _ =>
-            abort("Unexpected array element type: " + elem)
+            abort("Unexpected array element type: " + elementType)
         }
 
       case _ =>
diff --git a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
index 65c685b350..4f764f6fc0 100644
--- a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
+++ b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
@@ -679,7 +679,7 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers {
     val specMember = sym.cloneSymbol(owner) // this method properly duplicates the symbol's info
     specMember.name = specializedName(sym, env)
 
-    specMember.setInfo(subst(env, specMember.info))
+    specMember.setInfo(subst(env, specMember.info.asSeenFrom(owner.thisType, sym.owner)))
       .setFlag(SPECIALIZED)
       .resetFlag(DEFERRED | CASEACCESSOR | ACCESSOR | LAZY)
   }
@@ -748,8 +748,8 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers {
     for  (overriding <- clazz.info.decls;
           val (overridden, env) = needsSpecialOverride(overriding, overriding.allOverriddenSymbols)
           if overridden != NoSymbol) {
-      log("Added specialized overload for " + overriding.fullName + " in env: " + env)
       val om = specializedOverload(clazz, overridden, env)
+      log("Added specialized overload for %s in env: %s with type: %s".format(overriding.fullName, env, om.info))
       typeEnv(om) = env
       concreteSpecMethods += overriding
       if (!overriding.isDeferred) {  // concrete method
-- 
cgit v1.2.3