diff options
| author | Paul Phillips <paulp@improving.org> | 2013-03-05 07:57:23 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-03-05 07:57:23 -0800 |
| commit | 1a84c86ce400d0a80065fa8d23a9506dc19e92f0 (patch) | |
| tree | bf70ba1f113b8bb535850b5e42f27a51dcb2eff4 /src | |
| parent | 5d54cf9e375d796c59b1dd488c15f88f4bfb14d6 (diff) | |
| parent | 1117be8418525ce20af847bdcfdbbe66b9cf3d4d (diff) | |
| download | scala-1a84c86ce400d0a80065fa8d23a9506dc19e92f0.tar.gz scala-1a84c86ce400d0a80065fa8d23a9506dc19e92f0.tar.bz2 scala-1a84c86ce400d0a80065fa8d23a9506dc19e92f0.zip | |
Merge pull request #2178 from scalamacros/ticket/7190
SI-7190 macros no longer give rise to bridges
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/Erasure.scala | 1 |
1 files changed, 1 insertions, 0 deletions
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) |