From 1117be8418525ce20af847bdcfdbbe66b9cf3d4d Mon Sep 17 00:00:00 2001 From: Eugene Burmako Date: Wed, 27 Feb 2013 16:27:10 +0100 Subject: SI-7190 macros no longer give rise to bridges Amazingly enough, this got through all the testing we performed. But now erasure knows that it shouldn't generate bridges for macro methods. --- src/compiler/scala/tools/nsc/transform/Erasure.scala | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/compiler/scala/tools/nsc/transform/Erasure.scala b/src/compiler/scala/tools/nsc/transform/Erasure.scala index 889d309ba9..cb5268c422 100644 --- a/src/compiler/scala/tools/nsc/transform/Erasure.scala +++ b/src/compiler/scala/tools/nsc/transform/Erasure.scala @@ -477,6 +477,7 @@ abstract class Erasure extends AddInterfaces def checkPair(member: Symbol, other: Symbol) { val otpe = specialErasure(root)(other.tpe) val bridgeNeeded = afterErasure ( + !member.isMacro && !(other.tpe =:= member.tpe) && !(deconstMap(other.tpe) =:= deconstMap(member.tpe)) && { var e = bridgesScope.lookupEntry(member.name) -- cgit v1.2.3