WIP on invalid specialize flag pickling.

axel22 · Jul 5, 2012 · 514925c · 514925c
1 parent 171a1d8
commit 514925c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala b/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala
@@ -156,6 +156,7 @@ abstract class Pickler extends SubComponent {
 
             putChildren(sym, children.toList sortBy (_.sealedSortName))
           }
+          if (sym.isTypeParameter && sym.hasAnnotation(definitions.SpecializedClass)) sym.setFlag(SPECIALIZED)
           for (annot <- (sym.annotations filter (ann => ann.isStatic && !ann.isErroneous)).reverse)
             putAnnotation(sym, annot)
         }

diff --git a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
@@ -631,7 +631,7 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers {
         overloads(specMember) ::= Overload(om, typeEnv(om))
         enterMember(om)
       }
-
+      
       for (m <- normMembers ; if needsSpecialization(outerEnv ++ env, m) && satisfiable(fullEnv)) {
         if (!m.isDeferred)
           addConcreteSpecMethod(m)
@@ -1573,7 +1573,7 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers {
               }
 
             case fwd @ Forward(_) =>
-              debuglog("forward: " + fwd + ", " + ddef)
+              debuglog("forward: " + fwd + ", " + ddef + ", " + tree.symbol.owner)
               val rhs1 = forwardCall(tree.pos, gen.mkAttributedRef(symbol.owner.thisType, fwd.target), vparamss)
               debuglog("-->d completed forwarder to specialized overload: " + fwd.target + ": " + rhs1)
               reportError {

diff --git a/src/compiler/scala/tools/nsc/transform/UnCurry.scala b/src/compiler/scala/tools/nsc/transform/UnCurry.scala
@@ -566,10 +566,10 @@ abstract class UnCurry extends InfoTransform
       val sym = tree.symbol
       // Take a pass looking for @specialize annotations and set all
       // their SPECIALIZE flags for cheaper recognition.
-      if ((sym ne null) && (sym.isClass || sym.isMethod)) {
-        for (tp <- sym.typeParams ; if tp hasAnnotation SpecializedClass)
-          tp setFlag SPECIALIZED
-      }
+      // if ((sym ne null) && (sym.isClass || sym.isMethod)) {
+      //   for (tp <- sym.typeParams ; if tp hasAnnotation SpecializedClass)
+      //     tp setFlag SPECIALIZED
+      // }
       val result = (
         // TODO - settings.noassertions.value temporarily retained to avoid
         // breakage until a reasonable interface is settled upon.

diff --git a/src/reflect/scala/reflect/internal/pickling/UnPickler.scala b/src/reflect/scala/reflect/internal/pickling/UnPickler.scala
@@ -486,7 +486,9 @@ abstract class UnPickler /*extends reflect.generic.UnPickler*/ {
         errorBadSignature("symbol annotation expected ("+ tag +")")
       val end = readNat() + readIndex
       val target = readSymbolRef()
-      target.addAnnotation(readAnnotationInfo(end))
+      val annot = readAnnotationInfo(end)
+      target.addAnnotation(annot)
+      if (target.hasAnnotation(definitions.SpecializedClass)) target.setFlag(SPECIALIZED)
     }
 
     /** Read an annotation and return it. Used when unpickling