diff options
| author | Iulian Dragos <jaguarul@gmail.com> | 2010-09-01 14:04:09 +0000 |
|---|---|---|
| committer | Iulian Dragos <jaguarul@gmail.com> | 2010-09-01 14:04:09 +0000 |
| commit | b21306f9d2ffce195cf87bf2e15b7665201363c9 (patch) | |
| tree | 337a4d34fcf6342df0ba613715b63edde8c3fb9c | |
| parent | f52089a07e3dcd276d36531ca6af0d706e1ee0cd (diff) | |
| download | scala-b21306f9d2ffce195cf87bf2e15b7665201363c9.tar.gz scala-b21306f9d2ffce195cf87bf2e15b7665201363c9.tar.bz2 scala-b21306f9d2ffce195cf87bf2e15b7665201363c9.zip | |
Merged revisions 22815 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk
........
r22815 | dragos | 2010-08-23 10:52:12 +0200 (Mon, 23 Aug 2010) | 1 line
Fix for not looking into Java types when specializing. ........
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala index 3075a6d73b..34bade24ef 100644 --- a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala +++ b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala @@ -875,7 +875,10 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers { */ override def transformInfo(sym: Symbol, tpe: Type): Type = { val res = tpe match { - case PolyType(targs, ClassInfoType(base, decls, clazz)) if clazz != definitions.RepeatedParamClass && clazz != definitions.JavaRepeatedParamClass => + case PolyType(targs, ClassInfoType(base, decls, clazz)) + if clazz != definitions.RepeatedParamClass + && clazz != definitions.JavaRepeatedParamClass + && !clazz.hasFlag(JAVA) => val parents = base map specializedType if (settings.debug.value) log("transformInfo (poly) " + clazz + " with parents1: " + parents + " ph: " + phase) // if (clazz.name.toString == "$colon$colon") @@ -884,7 +887,7 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers { new Scope(specializeClass(clazz, typeEnv(clazz)) ::: specialOverrides(clazz)), clazz)) - case ClassInfoType(base, decls, clazz) if !clazz.isPackageClass => + case ClassInfoType(base, decls, clazz) if !clazz.isPackageClass && !clazz.hasFlag(JAVA) => atPhase(phase.next)(base.map(_.typeSymbol.info)) val parents = base map specializedType if (settings.debug.value) log("transformInfo " + clazz + " with parents1: " + parents + " ph: " + phase) |