[no merge] Don't emit mixin forwarders as bridge

smarter · smarter · commit 46cda53d34ef · 2019-03-11T21:37:37.000+01:00
diff --git a/src/compiler/scala/tools/nsc/transform/Mixin.scala b/src/compiler/scala/tools/nsc/transform/Mixin.scala
@@ -169,7 +169,7 @@ abstract class Mixin extends Transform with ast.TreeDSL with AccessorSynthesis {
     clazz.info.decls enter member setFlag MIXEDIN resetFlag JAVA_DEFAULTMETHOD
   }
   def cloneAndAddMember(mixinClass: Symbol, mixinMember: Symbol, clazz: Symbol): Symbol =
-    addMember(clazz, mixinMember.cloneSymbol(clazz).setFlag(BRIDGE))
+    addMember(clazz, mixinMember.cloneSymbol(clazz)/*.setFlag(BRIDGE)*/)
 
   def publicizeTraitMethods(clazz: Symbol): Unit = {
     if (treatedClassInfos(clazz) != clazz.info) {

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ abstract class Mixin extends Transform with ast.TreeDSL with AccessorSynthesis {`
`169`	`169`	`clazz.info.decls enter member setFlag MIXEDIN resetFlag JAVA_DEFAULTMETHOD`
`170`	`170`	`}`
`171`	`171`	`def cloneAndAddMember(mixinClass: Symbol, mixinMember: Symbol, clazz: Symbol): Symbol =`
`172`		`- addMember(clazz, mixinMember.cloneSymbol(clazz).setFlag(BRIDGE))`
	`172`	`+ addMember(clazz, mixinMember.cloneSymbol(clazz)/.setFlag(BRIDGE)/)`
`173`	`173`
`174`	`174`	`def publicizeTraitMethods(clazz: Symbol): Unit = {`
`175`	`175`	`if (treatedClassInfos(clazz) != clazz.info) {`