diff options
author | James Iry <james.iry@typesafe.com> | 2012-12-06 21:46:14 -0800 |
---|---|---|
committer | James Iry <james.iry@typesafe.com> | 2012-12-07 09:59:40 -0800 |
commit | d69912293410dd6f3cb205d70b9de8d1bd10ded9 (patch) | |
tree | 8c80970839a4ec7022f5b14b7d89cf168bbe3998 /src | |
parent | 58969850a0991a72c360433540943eae4b10dc6b (diff) | |
download | scala-d69912293410dd6f3cb205d70b9de8d1bd10ded9.tar.gz scala-d69912293410dd6f3cb205d70b9de8d1bd10ded9.tar.bz2 scala-d69912293410dd6f3cb205d70b9de8d1bd10ded9.zip |
SI-5789 Removes assertion about implclass flag in Mixin.scala
The assertion that the class being mixed from should be an implclass
seems reasonable, but the flag isn't always set. In order to stop the
bleeding this fix turns the assertion into a debug warning. Issue SI-6782
will track figuring out the root cause of the missing flag.
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/tools/nsc/transform/Mixin.scala | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/Mixin.scala b/src/compiler/scala/tools/nsc/transform/Mixin.scala index 64bb98e2c5..e59a70869f 100644 --- a/src/compiler/scala/tools/nsc/transform/Mixin.scala +++ b/src/compiler/scala/tools/nsc/transform/Mixin.scala @@ -269,7 +269,7 @@ abstract class Mixin extends InfoTransform with ast.TreeDSL { /** Mix in members of implementation class mixinClass into class clazz */ def mixinImplClassMembers(mixinClass: Symbol, mixinInterface: Symbol) { - assert(mixinClass.isImplClass, "Not an impl class:" + + if (!mixinClass.isImplClass) debugwarn ("Impl class flag is not set " + ((mixinClass.debugLocationString, mixinInterface.debugLocationString))) for (member <- mixinClass.info.decls ; if isForwarded(member)) { @@ -360,7 +360,6 @@ abstract class Mixin extends InfoTransform with ast.TreeDSL { // first complete the superclass with mixed in members addMixedinMembers(clazz.superClass, unit) - //Console.println("adding members of " + clazz.info.baseClasses.tail.takeWhile(superclazz !=) + " to " + clazz);//DEBUG for (mc <- clazz.mixinClasses ; if mc hasFlag lateINTERFACE) { // @SEAN: adding trait tracking so we don't have to recompile transitive closures unit.depends += mc |