summaryrefslogtreecommitdiff
path: root/src/compiler/scala/reflect/reify
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2014-11-07 11:10:15 +1000
committerJason Zaugg <jzaugg@gmail.com>2014-11-07 11:10:15 +1000
commit7830b4689a5f9962011f117c9b866a939795e58a (patch)
treecc3e0a2bbf67d350775d44dbe648ea2e37451c1c /src/compiler/scala/reflect/reify
parent000de44e3b1f1c0c4bc30eda8ef155548714a6af (diff)
parent17992f672f7d5663654a1ea365dfd1dad7061410 (diff)
downloadscala-7830b4689a5f9962011f117c9b866a939795e58a.tar.gz
scala-7830b4689a5f9962011f117c9b866a939795e58a.tar.bz2
scala-7830b4689a5f9962011f117c9b866a939795e58a.zip
Merge pull request #4083 from retronym/ticket/8947
SI-8947 Avoid cross talk between tag materializers and reify
Diffstat (limited to 'src/compiler/scala/reflect/reify')
-rw-r--r--src/compiler/scala/reflect/reify/Taggers.scala3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/compiler/scala/reflect/reify/Taggers.scala b/src/compiler/scala/reflect/reify/Taggers.scala
index 093c2bee22..0863ee38f9 100644
--- a/src/compiler/scala/reflect/reify/Taggers.scala
+++ b/src/compiler/scala/reflect/reify/Taggers.scala
@@ -79,8 +79,7 @@ abstract class Taggers {
try materializer
catch {
case ReificationException(pos, msg) =>
- c.error(pos.asInstanceOf[c.Position], msg) // this cast is a very small price for the sanity of exception handling
- EmptyTree
+ c.abort(pos.asInstanceOf[c.Position], msg) // this cast is a very small price for the sanity of exception handling
case UnexpectedReificationException(pos, err, cause) if cause != null =>
throw cause
}