diff options
| author | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2016-04-20 14:48:56 +0200 |
|---|---|---|
| committer | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2016-06-07 14:18:27 +0200 |
| commit | 49ace48a4d8032573f84ee7482430ce8529e2c86 (patch) | |
| tree | 2b65c32f183abc1d6d61d6cd844cfe0767823e4a /src/dotty/tools/dotc/transform/MoveStatics.scala | |
| parent | 5f73175aeed3fd769345dab21bc3a52d9b8915e4 (diff) | |
| download | dotty-49ace48a4d8032573f84ee7482430ce8529e2c86.tar.gz dotty-49ace48a4d8032573f84ee7482430ce8529e2c86.tar.bz2 dotty-49ace48a4d8032573f84ee7482430ce8529e2c86.zip | |
MoveStatics: fix a bug.
Nicely spotted by Ycheck.
Diffstat (limited to 'src/dotty/tools/dotc/transform/MoveStatics.scala')
| -rw-r--r-- | src/dotty/tools/dotc/transform/MoveStatics.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/transform/MoveStatics.scala b/src/dotty/tools/dotc/transform/MoveStatics.scala index 7b9d27c2b..8c1fe309b 100644 --- a/src/dotty/tools/dotc/transform/MoveStatics.scala +++ b/src/dotty/tools/dotc/transform/MoveStatics.scala @@ -39,7 +39,7 @@ class MoveStatics extends MiniPhaseTransform with SymTransformer { thisTransform if (!module.symbol.is(Flags.Module)) move(companion, module) else { val allMembers = - if(companion ne null) {companion.rhs.asInstanceOf[Template].body} else Nil ++ + (if(companion ne null) {companion.rhs.asInstanceOf[Template].body} else Nil) ++ module.rhs.asInstanceOf[Template].body val (newModuleBody, newCompanionBody) = allMembers.partition(x => {assert(x.symbol.exists); x.symbol.owner == module.symbol}) def rebuild(orig: TypeDef, newBody: List[Tree]): Tree = { @@ -48,6 +48,7 @@ class MoveStatics extends MiniPhaseTransform with SymTransformer { thisTransform val staticFields = newBody.filter(x => x.isInstanceOf[ValDef] && x.symbol.hasAnnotation(defn.ScalaStaticAnnot)).asInstanceOf[List[ValDef]] val newBodyWithStaticConstr = if (staticFields.nonEmpty) { + /* do NOT put Flags.JavaStatic here. It breaks .enclosingClass */ val staticCostructor = ctx.newSymbol(orig.symbol, Names.STATIC_CONSTRUCTOR, Flags.Synthetic | Flags.Method, MethodType(Nil, defn.UnitType)) staticCostructor.addAnnotation(Annotation(defn.ScalaStaticAnnot)) staticCostructor.entered |