diff options
| author | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2016-04-18 21:27:10 +0200 |
|---|---|---|
| committer | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2016-06-07 14:18:27 +0200 |
| commit | 806a0294f6055122c1eb2f32801f14b71f35ae5b (patch) | |
| tree | cbcb1364efb5d73eda9eb50fb73f2f6252c486a7 /src/dotty/tools/dotc/transform/Constructors.scala | |
| parent | bbd48d3d52449a379ea31f8619c5f5e5f9f1aaac (diff) | |
| download | dotty-806a0294f6055122c1eb2f32801f14b71f35ae5b.tar.gz dotty-806a0294f6055122c1eb2f32801f14b71f35ae5b.tar.bz2 dotty-806a0294f6055122c1eb2f32801f14b71f35ae5b.zip | |
Constructors: do not lift static val initialisation into constructors.
Diffstat (limited to 'src/dotty/tools/dotc/transform/Constructors.scala')
| -rw-r--r-- | src/dotty/tools/dotc/transform/Constructors.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dotty/tools/dotc/transform/Constructors.scala b/src/dotty/tools/dotc/transform/Constructors.scala index 44638ce48..db850e944 100644 --- a/src/dotty/tools/dotc/transform/Constructors.scala +++ b/src/dotty/tools/dotc/transform/Constructors.scala @@ -91,7 +91,7 @@ class Constructors extends MiniPhaseTransform with IdentityDenotTransformer { th */ override def checkPostCondition(tree: tpd.Tree)(implicit ctx: Context): Unit = { tree match { - case tree: ValDef if tree.symbol.exists && tree.symbol.owner.isClass && !tree.symbol.is(Lazy) => + case tree: ValDef if tree.symbol.exists && tree.symbol.owner.isClass && !tree.symbol.is(Lazy) && !tree.symbol.hasAnnotation(defn.ScalaStaticAnnot) => assert(tree.rhs.isEmpty, i"$tree: initializer should be moved to constructors") case tree: DefDef if !tree.symbol.is(LazyOrDeferred) => assert(!tree.rhs.isEmpty, i"unimplemented: $tree") @@ -181,7 +181,7 @@ class Constructors extends MiniPhaseTransform with IdentityDenotTransformer { th def splitStats(stats: List[Tree]): Unit = stats match { case stat :: stats1 => stat match { - case stat @ ValDef(name, tpt, _) if !stat.symbol.is(Lazy) => + case stat @ ValDef(name, tpt, _) if !stat.symbol.is(Lazy) && !stat.symbol.hasAnnotation(defn.ScalaStaticAnnot) => val sym = stat.symbol if (isRetained(sym)) { if (!stat.rhs.isEmpty && !isWildcardArg(stat.rhs)) |