summaryrefslogtreecommitdiff
path: root/src/reflect
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-12-19 11:20:04 -0800
committerPaul Phillips <paulp@improving.org>2012-12-19 11:20:04 -0800
commit8d2505da041b902b4c4304ca783d5a6b8b9b6c52 (patch)
treed1bc4ea2403b57ebcfa553314c603bfb4967268e /src/reflect
parent1c68bc00be37a6f51ea1d4930e0899c078033ccb (diff)
parent9ba7cf856b5eb6a9c6277a09f5da75e2bfea05c2 (diff)
downloadscala-8d2505da041b902b4c4304ca783d5a6b8b9b6c52.tar.gz
scala-8d2505da041b902b4c4304ca783d5a6b8b9b6c52.tar.bz2
scala-8d2505da041b902b4c4304ca783d5a6b8b9b6c52.zip
Merge pull request #1759 from scalamacros/topic/annotated
fixes incorrect handling of Annotated in lazy copier
Diffstat (limited to 'src/reflect')
-rw-r--r--src/reflect/scala/reflect/internal/Trees.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/reflect/scala/reflect/internal/Trees.scala b/src/reflect/scala/reflect/internal/Trees.scala
index dceec18e57..431afd286d 100644
--- a/src/reflect/scala/reflect/internal/Trees.scala
+++ b/src/reflect/scala/reflect/internal/Trees.scala
@@ -811,7 +811,7 @@ trait Trees extends api.Trees { self: SymbolTable =>
}
def Annotated(tree: Tree, annot: Tree, arg: Tree) = tree match {
case t @ Annotated(annot0, arg0)
- if (annot0==annot) => t
+ if (annot0==annot && arg0==arg) => t
case _ => treeCopy.Annotated(tree, annot, arg)
}
def SingletonTypeTree(tree: Tree, ref: Tree) = tree match {