diff options
4 files changed, 18 insertions, 12 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/AddInterfaces.scala b/src/compiler/scala/tools/nsc/transform/AddInterfaces.scala index 7c891667b4..7e523d292c 100644 --- a/src/compiler/scala/tools/nsc/transform/AddInterfaces.scala +++ b/src/compiler/scala/tools/nsc/transform/AddInterfaces.scala @@ -58,8 +58,12 @@ abstract class AddInterfaces extends InfoTransform { private def isInterfaceMember(sym: Symbol): Boolean = { sym.isType || { sym.info; // to set lateMETHOD flag if necessary - sym.isMethod && !sym.isLabel && !(sym hasFlag (PRIVATE | BRIDGE)) && - !sym.isConstructor && !sym.isImplOnly + sym.isMethod && + !sym.isLabel && + !(sym hasFlag PRIVATE) && + (!(sym hasFlag BRIDGE) || (sym hasAnnotation BridgeClass)) && // count @_$bridge$_ annotated classes as interface members + !sym.isConstructor && + !sym.isImplOnly } } diff --git a/src/compiler/scala/tools/nsc/transform/LambdaLift.scala b/src/compiler/scala/tools/nsc/transform/LambdaLift.scala index 39b47d1e08..98b6110f7f 100644 --- a/src/compiler/scala/tools/nsc/transform/LambdaLift.scala +++ b/src/compiler/scala/tools/nsc/transform/LambdaLift.scala @@ -402,8 +402,6 @@ abstract class LambdaLift extends InfoTransform { val tree1 = addFreeParams(tree, sym) if (sym.isLocal) liftDef(tree1) else tree1 case DefDef(_, _, _, _, _, _) => - if (sym.hasAnnotation(definitions.BridgeClass)) - sym.setFlag(BRIDGE) val tree1 = addFreeParams(tree, sym) if (sym.isLocal) liftDef(tree1) else tree1 case ValDef(mods, name, tpt, rhs) => diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala index 3b3eb74745..29762360ea 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala @@ -454,6 +454,8 @@ trait Namers { self: Analyzer => finishWith(tparams) case DefDef(mods, name, tparams, _, _, _) => tree.symbol = enterNewMethod(tree, name, mods.flags, mods, tree.pos) + if (mods.annotations.exists(ann => isAnn(ann, "bridge"))) + tree.symbol setFlag BRIDGE finishWith(tparams) case TypeDef(mods, name, tparams, _) => var flags: Long = mods.flags @@ -496,14 +498,15 @@ trait Namers { self: Analyzer => def enterAccessorMethod(tree: Tree, name: Name, flags: Long, mods: Modifiers): TermSymbol = enterNewMethod(tree, name, flags, mods, tree.pos.focus) + def isAnn(ann: Tree, demand: String) = ann match { + case Apply(Select(New(Ident(name)), _), _) => + name.toString == demand + case Apply(Select(New(Select(pre, name)), _), _) => + name.toString == demand + case _ => false + } + private def addBeanGetterSetter(vd: ValDef, getter: Symbol) { - def isAnn(ann: Tree, demand: String) = ann match { - case Apply(Select(New(Ident(name)), _), _) => - name.toString == demand - case Apply(Select(New(Select(pre, name)), _), _) => - name.toString == demand - case _ => false - } val ValDef(mods, name, tpt, _) = vd val hasBP = mods.annotations.exists(isAnn(_, "BeanProperty")) val hasBoolBP = mods.annotations.exists(isAnn(_, "BooleanBeanProperty")) diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index 9b23cf188b..acf35b9854 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -2096,7 +2096,8 @@ trait Typers extends Modes { (e.sym.isType || inBlock || (e.sym.tpe matches e1.sym.tpe))) // default getters are defined twice when multiple overloads have defaults. an // error for this is issued in RefChecks.checkDefaultsInOverloaded - if (!e.sym.isErroneous && !e1.sym.isErroneous && !e.sym.hasDefaultFlag) { + if (!e.sym.isErroneous && !e1.sym.isErroneous && !e.sym.hasDefaultFlag && + !e.sym.hasAnnotation(BridgeClass) && !e1.sym.hasAnnotation(BridgeClass)) { error(e.sym.pos, e1.sym+" is defined twice"+ {if(!settings.debug.value) "" else " in "+unit.toString}) scope.unlink(e1) // need to unlink to avoid later problems with lub; see #2779 |