summaryrefslogtreecommitdiff
path: root/src/reflect
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2012-10-30 17:34:15 +0100
committerAdriaan Moors <adriaan.moors@epfl.ch>2012-10-30 13:36:45 -0700
commitfb6e68713060e7904a7d93012470a946ca7e2375 (patch)
tree39da3f53036e17252ab3f7a62f329fba14af44a4 /src/reflect
parent2c554249fd8e99286134b217027b6e3cb2c92d77 (diff)
downloadscala-fb6e68713060e7904a7d93012470a946ca7e2375.tar.gz
scala-fb6e68713060e7904a7d93012470a946ca7e2375.tar.bz2
scala-fb6e68713060e7904a7d93012470a946ca7e2375.zip
SI-6556 no assert for surprising ctor result type
Previous fix to value classes uncovered some questionable cases in the backend where result types of constructor signatures are surprising. It's not a big deal because these types will be ignored afterwards anyway. But the method uncovered some questionable situations which we should follow up on. However, breaking 2.9 code because of this is way too harsh. That's why the asserts were converted to warnings. review by @paulp, @adriaanm
Diffstat (limited to 'src/reflect')
-rw-r--r--src/reflect/scala/reflect/internal/transform/Erasure.scala14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/reflect/scala/reflect/internal/transform/Erasure.scala b/src/reflect/scala/reflect/internal/transform/Erasure.scala
index 977398909f..52d1657dc3 100644
--- a/src/reflect/scala/reflect/internal/transform/Erasure.scala
+++ b/src/reflect/scala/reflect/internal/transform/Erasure.scala
@@ -214,6 +214,9 @@ trait Erasure {
specialConstructorErasure(clazz, restpe)
case ExistentialType(tparams, restpe) =>
specialConstructorErasure(clazz, restpe)
+ case RefinedType(parents, decls) =>
+ specialConstructorErasure(
+ clazz, specialScalaErasure.mergeParents(parents))
case mt @ MethodType(params, restpe) =>
MethodType(
cloneSymbolsAndModify(params, specialScalaErasure),
@@ -221,7 +224,16 @@ trait Erasure {
case TypeRef(pre, `clazz`, args) =>
typeRef(pre, clazz, List())
case tp =>
- assert(clazz == ArrayClass || tp.isError, s"unexpected constructor erasure $tp for $clazz")
+ if (!(clazz == ArrayClass || tp.isError))
+ // See SI-6556. It seems in some cases the result constructor
+ // type of an anonymous class is a different version of the class.
+ // This has nothing to do with value classes per se.
+ // We simply used a less discriminating transform before, that
+ // did not look at the cases in detail.
+ // It seems there is a deeper problem here, which needs
+ // following up to. But we will not risk regressions
+ // in 2.10 because of it.
+ log(s"!!! unexpected constructor erasure $tp for $clazz")
specialScalaErasure(tp)
}
}