summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Burmako <xeno.by@gmail.com>2013-11-07 23:46:43 -0800
committerEugene Burmako <xeno.by@gmail.com>2013-11-07 23:46:43 -0800
commitf0cee6a244a999908f2aba1c8b59b6fd568f3c4b (patch)
tree93f47480115518105d86bd84e353af862e72f35b
parente5ccdb0ebf37d07f764f903d73abcfe1fec5436b (diff)
parent086702d8a74d6642622c6b5bb3524bd6d9abbf7e (diff)
downloadscala-f0cee6a244a999908f2aba1c8b59b6fd568f3c4b.tar.gz
scala-f0cee6a244a999908f2aba1c8b59b6fd568f3c4b.tar.bz2
scala-f0cee6a244a999908f2aba1c8b59b6fd568f3c4b.zip
Merge pull request #3101 from xeno-by/ticket/7776
SI-7776 post-erasure signature clashes are now macro-aware
-rw-r--r--src/compiler/scala/tools/nsc/transform/Erasure.scala11
-rw-r--r--test/files/pos/t7776.check0
-rw-r--r--test/files/pos/t7776.scala20
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 68f1c81c59..a4854dfbeb 100644
--- a/src/compiler/scala/tools/nsc/transform/Erasure.scala
+++ b/src/compiler/scala/tools/nsc/transform/Erasure.scala
@@ -708,6 +708,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
@@ -716,7 +719,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
@@ -746,12 +749,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