Mercurial > hg > graal-compiler
diff src/share/vm/prims/jvm.cpp @ 8031:927a311d00f9
8007320: NPG: move method annotations
Summary: allocate method annotations and attach to ConstMethod if present
Reviewed-by: dcubed, jiangli, sspitsyn, iklam
author | coleenp |
---|---|
date | Mon, 11 Feb 2013 14:06:22 -0500 |
parents | 41d73c9b30a8 |
children | 5fc51c1ecdeb 2c7663baeb67 16885e702c88 |
line wrap: on
line diff
--- a/src/share/vm/prims/jvm.cpp Fri Feb 08 16:56:03 2013 -0800 +++ b/src/share/vm/prims/jvm.cpp Mon Feb 11 14:06:22 2013 -0500 @@ -1573,9 +1573,9 @@ if (!java_lang_Class::is_primitive(JNIHandles::resolve(cls))) { Klass* k = java_lang_Class::as_Klass(JNIHandles::resolve(cls)); if (k->oop_is_instance()) { - Annotations* type_annotations = InstanceKlass::cast(k)->type_annotations(); + AnnotationArray* type_annotations = InstanceKlass::cast(k)->class_type_annotations(); if (type_annotations != NULL) { - typeArrayOop a = Annotations::make_java_array(type_annotations->class_annotations(), CHECK_NULL); + typeArrayOop a = Annotations::make_java_array(type_annotations, CHECK_NULL); return (jbyteArray) JNIHandles::make_local(env, a); } }