--- a/jdk/src/share/classes/java/lang/Class.java	Wed Oct 23 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/java/lang/Class.java	Thu Oct 24 18:52:13 2013 +0200
@@ -3316,7 +3316,7 @@
 
         AnnotationData annotationData = annotationData();
         return AnnotationSupport.getAssociatedAnnotations(annotationData.declaredAnnotations,
-                                                          annotationData.annotations,
+                                                          this,
                                                           annotationClass);
     }
 
@@ -3442,6 +3442,10 @@
         return annotationType;
     }
 
+    Map<Class<? extends Annotation>, Annotation> getDeclaredAnnotationMap() {
+        return annotationData().declaredAnnotations;
+    }
+
     /* Backing store of user-defined values pertaining to this class.
      * Maintained by the ClassValue class.
      */