summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/ast/Trees.scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-12-10 14:11:28 -0800
committerPaul Phillips <paulp@improving.org>2013-01-30 03:50:52 -0800
commitff92610c48ad13c17f0374619faa9c2c6e1dd0e5 (patch)
tree92398cdd1919b1bef9708ba506f12a4651422a74 /src/compiler/scala/tools/nsc/ast/Trees.scala
parent98534b2cf67efc3930de427bfd1916fcf315fa59 (diff)
downloadscala-ff92610c48ad13c17f0374619faa9c2c6e1dd0e5.tar.gz
scala-ff92610c48ad13c17f0374619faa9c2c6e1dd0e5.tar.bz2
scala-ff92610c48ad13c17f0374619faa9c2c6e1dd0e5.zip
SI-6595, lost modifiers in early defs.
[backport] Saw this by accident; the trees created for early defs would wholesale replace the modifiers with PRESUPER rather than combining them. FINAL was lost that way, as would be any other modifiers which might be valid there.
Diffstat (limited to 'src/compiler/scala/tools/nsc/ast/Trees.scala')
-rw-r--r--src/compiler/scala/tools/nsc/ast/Trees.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/Trees.scala b/src/compiler/scala/tools/nsc/ast/Trees.scala
index 54402f0903..def1198dae 100644
--- a/src/compiler/scala/tools/nsc/ast/Trees.scala
+++ b/src/compiler/scala/tools/nsc/ast/Trees.scala
@@ -111,7 +111,7 @@ trait Trees extends scala.reflect.internal.Trees { self: Global =>
rhs = EmptyTree
)
}
- val lvdefs = evdefs collect { case vdef: ValDef => copyValDef(vdef)(mods = Modifiers(PRESUPER)) }
+ val lvdefs = evdefs collect { case vdef: ValDef => copyValDef(vdef)(mods = vdef.mods | PRESUPER) }
val constrs = {
if (constrMods hasFlag TRAIT) {