Hardened/documented AnyVal constructor switcheroo.

2 files changed, 3 insertions, 0 deletions

diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
index 97c264fa4b..c2b4dc32b6 100644
--- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
@@ -2754,6 +2754,8 @@ self =>
       val tstart0 = if (body.isEmpty && in.lastOffset < tstart) in.lastOffset else tstart
       atPos(tstart0) {
         if (inScalaPackage && name == tpnme.AnyVal) {
+          // Not a well-formed constructor, has to be finished later - see note
+          // regarding AnyVal constructor in AddInterfaces.
           val constructor = DefDef(NoMods, nme.CONSTRUCTOR, Nil, List(Nil), TypeTree(), Block(Nil, Literal(Constant())))
           Template(parents0, self, constructor :: body)
         }
diff --git a/src/compiler/scala/tools/nsc/transform/AddInterfaces.scala b/src/compiler/scala/tools/nsc/transform/AddInterfaces.scala
index 971a0c9aab..e7759f1d7e 100644
--- a/src/compiler/scala/tools/nsc/transform/AddInterfaces.scala
+++ b/src/compiler/scala/tools/nsc/transform/AddInterfaces.scala
@@ -309,6 +309,7 @@ abstract class AddInterfaces extends InfoTransform {
             stats span (t => t.hasSymbolWhich(_ hasFlag PRESUPER))
             treeCopy.Block(tree, presuper ::: (supercall :: mixinConstructorCalls ::: rest), expr)
           case (Nil, Nil) =>
+            assert(clazz eq AnyValClass, clazz)
             // AnyVal constructor - have to provide a real body so the
             // jvm doesn't throw a VerifyError. But we can't add the
             // body until now, because the typer knows that Any has no