summaryrefslogtreecommitdiff
path: root/src/reflect/scala/reflect/internal/AnnotationInfos.scala
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2014-05-08 14:00:16 +0200
committerJason Zaugg <jzaugg@gmail.com>2014-05-08 14:00:16 +0200
commitb7f91a206cca9ab9bb87d0f7872ddf213ba10f82 (patch)
tree81e5681d1adf382e91a461346734ddf4b93d0f82 /src/reflect/scala/reflect/internal/AnnotationInfos.scala
parentac8b44d731046691bda59439d25ab5ec23aaa56d (diff)
parentec05aeb3d6e414d2abf8354849eeaa7cc75ee477 (diff)
downloadscala-b7f91a206cca9ab9bb87d0f7872ddf213ba10f82.tar.gz
scala-b7f91a206cca9ab9bb87d0f7872ddf213ba10f82.tar.bz2
scala-b7f91a206cca9ab9bb87d0f7872ddf213ba10f82.zip
Merge commit 'ec05aeb' into topic/merge-2.10.x
Diffstat (limited to 'src/reflect/scala/reflect/internal/AnnotationInfos.scala')
-rw-r--r--src/reflect/scala/reflect/internal/AnnotationInfos.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/reflect/scala/reflect/internal/AnnotationInfos.scala b/src/reflect/scala/reflect/internal/AnnotationInfos.scala
index 19e9eef851..f814a746f5 100644
--- a/src/reflect/scala/reflect/internal/AnnotationInfos.scala
+++ b/src/reflect/scala/reflect/internal/AnnotationInfos.scala
@@ -302,7 +302,7 @@ trait AnnotationInfos extends api.Annotations { self: SymbolTable =>
*/
def defaultTargets = symbol.annotations map (_.symbol) filter isMetaAnnotation
// Test whether the typeSymbol of atp conforms to the given class.
- def matches(clazz: Symbol) = symbol isNonBottomSubClass clazz
+ def matches(clazz: Symbol) = !symbol.isInstanceOf[StubSymbol] && (symbol isNonBottomSubClass clazz)
// All subtrees of all args are considered.
def hasArgWhich(p: Tree => Boolean) = args exists (_ exists p)