Merge pull request #9330 from SethTisue/uncomment-compiler-assert

uncomment an assert in compiler after re-STARR
scala · Nov 20, 2020 · cc3242b · cc3242b
2 parents e139315 + 90b8b46
commit cc3242b
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/compiler/scala/tools/nsc/transform/Mixin.scala b/src/compiler/scala/tools/nsc/transform/Mixin.scala
@@ -234,8 +234,7 @@ abstract class Mixin extends Transform with ast.TreeDSL with AccessorSynthesis {
         if (member.isMethod) publicizeTraitMethod(member)
         else {
           assert(member.isTerm && !member.isDeferred, member)
-          // disable assert to support compiling against code compiled by an older compiler (until we re-starr)
-          // assert(member hasFlag PRESUPER, s"unexpected $member in $clazz ${member.debugFlagString}")
+          assert(member hasFlag PRESUPER, s"unexpected $member in $clazz ${member.debugFlagString}")
           clazz.info.decls.unlink(member)
         }