diff options
Diffstat (limited to 'src/compiler/scala/tools/nsc/transform/Mixin.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/Mixin.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/Mixin.scala b/src/compiler/scala/tools/nsc/transform/Mixin.scala index 4a13690efd..3dc9588208 100644 --- a/src/compiler/scala/tools/nsc/transform/Mixin.scala +++ b/src/compiler/scala/tools/nsc/transform/Mixin.scala @@ -284,7 +284,7 @@ abstract class Mixin extends InfoTransform { setFlag (LOCAL | PRIVATE | member.getFlag(MUTABLE | LAZY)) setFlag (if (!member.hasFlag(STABLE)) MUTABLE else 0) setInfo member.tpe.resultType - setAttributes member.attributes) + setAnnotations member.annotations) } } } else if (member hasFlag SUPERACCESSOR) { // mixin super accessors @@ -565,7 +565,7 @@ abstract class Mixin extends InfoTransform { .setInfo(definitions.IntClass.tpe) .setFlag(PROTECTED) atPhase(currentRun.typerPhase) { - sym.attributes = AnnotationInfo(definitions.VolatileAttr.tpe, List(), List()) :: sym.attributes + sym.addAnnotation(AnnotationInfo(definitions.VolatileAttr.tpe, List(), List())) } clazz.info.decls.enter(sym) addDef(clazz.pos, ValDef(sym, Literal(Constant(0)))) |