diff options
author | Eugene Burmako <xeno.by@gmail.com> | 2013-10-18 22:12:16 +0200 |
---|---|---|
committer | Eugene Burmako <xeno.by@gmail.com> | 2013-11-05 16:15:35 +0100 |
commit | 086702d8a74d6642622c6b5bb3524bd6d9abbf7e (patch) | |
tree | 07a2c9abc9b8b8471a8856d934252ebcdf1a8374 | |
parent | 4a6882e7729ab010848fe0744c55f096164e1853 (diff) | |
download | scala-086702d8a74d6642622c6b5bb3524bd6d9abbf7e.tar.gz scala-086702d8a74d6642622c6b5bb3524bd6d9abbf7e.tar.bz2 scala-086702d8a74d6642622c6b5bb3524bd6d9abbf7e.zip |
SI-7776 post-erasure signature clashes are now macro-aware
"double definition: macro this and method that have same type after erasure"
This error doesn't make sense when macros are involved, because macros
expand at compile-time, where we're not affected by erasure. Moreover,
macros produce no bytecode, which means that we're safe from VerifyErrors.
-rw-r--r-- | src/compiler/scala/tools/nsc/transform/Erasure.scala | 11 | ||||
-rw-r--r-- | test/files/pos/t7776.check | 0 | ||||
-rw-r--r-- | test/files/pos/t7776.scala | 20 |
3 files changed, 27 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/Erasure.scala b/src/compiler/scala/tools/nsc/transform/Erasure.scala index f0d3db1296..0a24967ddb 100644 --- a/src/compiler/scala/tools/nsc/transform/Erasure.scala +++ b/src/compiler/scala/tools/nsc/transform/Erasure.scala @@ -866,6 +866,9 @@ abstract class Erasure extends AddInterfaces low setInfo ErrorType } + private def sameTypeAfterErasure(sym1: Symbol, sym2: Symbol) = + exitingPostErasure(sym1.info =:= sym2.info) && !sym1.isMacro && !sym2.isMacro + /** TODO - adapt SymbolPairs so it can be used here. */ private def checkNoDeclaredDoubleDefs(base: Symbol) { val decls = base.info.decls @@ -874,7 +877,7 @@ abstract class Erasure extends AddInterfaces if (e.sym.isTerm) { var e1 = decls lookupNextEntry e while (e1 ne null) { - if (exitingPostErasure(e1.sym.info =:= e.sym.info)) + if (sameTypeAfterErasure(e.sym, e1.sym)) doubleDefError(new SymbolPair(base, e.sym, e1.sym)) e1 = decls lookupNextEntry e1 @@ -904,12 +907,12 @@ abstract class Erasure extends AddInterfaces ) override def matches(sym1: Symbol, sym2: Symbol) = true } - def sameTypeAfterErasure(pair: SymbolPair) = { + def isErasureDoubleDef(pair: SymbolPair) = { import pair._ log(s"Considering for erasure clash:\n$pair") - !exitingRefchecks(lowType matches highType) && exitingPostErasure(low.tpe =:= high.tpe) + !exitingRefchecks(lowType matches highType) && sameTypeAfterErasure(low, high) } - opc.iterator filter sameTypeAfterErasure foreach doubleDefError + opc.iterator filter isErasureDoubleDef foreach doubleDefError } /** Add bridge definitions to a template. This means: diff --git a/test/files/pos/t7776.check b/test/files/pos/t7776.check new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/test/files/pos/t7776.check diff --git a/test/files/pos/t7776.scala b/test/files/pos/t7776.scala new file mode 100644 index 0000000000..e0584b70e2 --- /dev/null +++ b/test/files/pos/t7776.scala @@ -0,0 +1,20 @@ +import scala.language.experimental.macros +import scala.reflect.macros.Context + +class MacroErasure { + def app(f: Any => Any, x: Any): Any = macro MacroErasure.appMacro + def app[A](f: A => Any, x: Any): Any = macro MacroErasure.appMacroA[A] +} + +object MacroErasure { + def appMacro(c: Context)( + f: c.Expr[Any => Any], x: c.Expr[Any]): c.Expr[Any] = { + import c.universe._ + c.Expr(q"$f($x)") + } + def appMacroA[A](c: Context)(f: c.Expr[A => Any], x: c.Expr[Any])( + implicit tt: c.WeakTypeTag[A]): c.Expr[Any] = { + import c.universe._ + c.Expr(q"$f[${tt.tpe}]($x)") + } +}
\ No newline at end of file |