summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-12-12 15:22:32 -0800
committerPaul Phillips <paulp@improving.org>2012-12-12 15:22:32 -0800
commit89decde4272c1428f884fd4c4d293cb6a8c7af13 (patch)
tree7b102c96a5fe9c3b86a48ad8881e18c9061f38af /src
parentcad4c1a7a70536f285623be2434f72ee5bbf601d (diff)
parenta9d2568b36c517b4691d2b5fcb60e6a8e30be3a5 (diff)
downloadscala-89decde4272c1428f884fd4c4d293cb6a8c7af13.tar.gz
scala-89decde4272c1428f884fd4c4d293cb6a8c7af13.tar.bz2
scala-89decde4272c1428f884fd4c4d293cb6a8c7af13.zip
Merge pull request #1749 from paulp/pr/6595
Fix for SI-6595, lost modifiers in early defs.
Diffstat (limited to 'src')
-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 c22f103f8b..0e3e2fe644 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) {