diff options
author | Paul Phillips <paulp@improving.org> | 2012-03-06 15:51:09 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-03-06 15:51:09 -0800 |
commit | d1b589642c5099239060aee0b8b506c3a2a04ae4 (patch) | |
tree | 14aec6febb577587357cc8c9690c1a3e14d0071a | |
parent | 5464973a8d159b6f097dc18c69c68f9e57d193b0 (diff) | |
parent | c5f68c11d3d8b9f12fe8608d7cea5d33c260c793 (diff) | |
download | scala-d1b589642c5099239060aee0b8b506c3a2a04ae4.tar.gz scala-d1b589642c5099239060aee0b8b506c3a2a04ae4.tar.bz2 scala-d1b589642c5099239060aee0b8b506c3a2a04ae4.zip |
Merge remote-tracking branch 'VladUreche/issue/5545-clean' into develop
-rw-r--r-- | src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala | 12 | ||||
-rw-r--r-- | test/files/run/t5545.check | 0 | ||||
-rw-r--r-- | test/files/run/t5545.scala | 27 |
3 files changed, 38 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala index 0851dad0c2..88ad458748 100644 --- a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala +++ b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala @@ -511,7 +511,17 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers { * was both already used for a map and mucho long. So "sClass" is the * specialized subclass of "clazz" throughout this file. */ - val sClass = clazz.owner.newClass(specializedName(clazz, env0).toTypeName, clazz.pos, (clazz.flags | SPECIALIZED) & ~CASE) + + // SI-5545: Eliminate classes with the same name loaded from the bytecode already present - all we need to do is + // to force .info on them, as their lazy type will be evaluated and the symbols will be eliminated. Unfortunately + // evaluating the info after creating the specialized class will mess the specialized class signature, so we'd + // better evaluate it before creating the new class symbol + val clazzName = specializedName(clazz, env0).toTypeName + val bytecodeClazz = clazz.owner.info.decl(clazzName) + debuglog("Specializing " + clazz + " found " + bytecodeClazz + " already there") + bytecodeClazz.info + + val sClass = clazz.owner.newClass(clazzName, clazz.pos, (clazz.flags | SPECIALIZED) & ~CASE) def cloneInSpecializedClass(member: Symbol, flagFn: Long => Long) = member.cloneSymbol(sClass, flagFn(member.flags | SPECIALIZED)) diff --git a/test/files/run/t5545.check b/test/files/run/t5545.check new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/test/files/run/t5545.check diff --git a/test/files/run/t5545.scala b/test/files/run/t5545.scala new file mode 100644 index 0000000000..7efa6d84f1 --- /dev/null +++ b/test/files/run/t5545.scala @@ -0,0 +1,27 @@ +import scala.tools.partest._ +import java.io._ + +object Test extends DirectTest { + + override def extraSettings: String = "-usejavacp -d " + testOutput.path + " -cp " + testOutput.path + + override def code = """ + // SI-5545 + trait F[@specialized(Int) T1, R] { + def f(v1: T1): R + def g = v1 => f(v1) + } + """.trim + + override def show(): Unit = { + // redirect err to out, for logging + val prevErr = System.err + System.setErr(System.out) + compile() + // the bug manifests at the second compilation, when the bytecode is already there + compile() + System.setErr(prevErr) + } + + override def isDebug = false // so we don't get the newSettings warning +} |