stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Vladimir Ivanov 2016-05-10 21:45:32 +00:00
commit a288d192f3
7 changed files with 38 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java
View File

@ -209,6 +209,15 @@ class HotSpotResolvedJavaFieldImpl implements HotSpotResolvedJavaField, HotSpotP
return new Annotation[0];
}
@Override
public Annotation[] getDeclaredAnnotations() {
Field javaField = toJava();
if (javaField != null) {
return javaField.getDeclaredAnnotations();
}
return new Annotation[0];
}
@Override
public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
Field javaField = toJava();

14
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java
View File

@ -472,7 +472,19 @@ final class HotSpotResolvedJavaMethodImpl extends HotSpotMethod implements HotSp
@Override
public Annotation[] getAnnotations() {
Executable javaMethod = toJava();
return javaMethod == null ? new Annotation[0] : javaMethod.getAnnotations();
if (javaMethod != null) {
return javaMethod.getAnnotations();
}
return new Annotation[0];
}
@Override
public Annotation[] getDeclaredAnnotations() {
Executable javaMethod = toJava();
if (javaMethod != null) {
return javaMethod.getDeclaredAnnotations();
}
return new Annotation[0];
}
@Override

5
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
View File

@ -743,6 +743,11 @@ final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implem
return mirror().getAnnotations();
}
@Override
public Annotation[] getDeclaredAnnotations() {
return mirror().getDeclaredAnnotations();
}
@Override
public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
return mirror().getAnnotation(annotationClass);

5
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java
View File

@ -203,6 +203,11 @@ public final class HotSpotResolvedPrimitiveType extends HotSpotResolvedJavaType
return new Annotation[0];
}
@Override
public Annotation[] getDeclaredAnnotations() {
return new Annotation[0];
}
@Override
public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
return null;

20
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaField.java
View File

@ -22,14 +22,14 @@
*/
package jdk.vm.ci.meta;
import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Modifier;
/**
* Represents a reference to a resolved Java field. Fields, like methods and types, are resolved
* through {@link ConstantPool constant pools}.
*/
public interface ResolvedJavaField extends JavaField, ModifiersProvider {
public interface ResolvedJavaField extends JavaField, ModifiersProvider, AnnotatedElement {
/**
* {@inheritDoc}
@ -60,22 +60,6 @@ public interface ResolvedJavaField extends JavaField, ModifiersProvider {
*/
ResolvedJavaType getDeclaringClass();
/**
* Returns all annotations of this field. If no annotations are present, an array of length 0 is
* returned.
*/
Annotation[] getAnnotations();
/**
* Returns the annotation for the specified type of this field, if such an annotation is
* present.
*
* @param annotationClass the Class object corresponding to the annotation type
* @return this element's annotation for the specified annotation type if present on this field,
* else {@code null}
*/
<T extends Annotation> T getAnnotation(Class<T> annotationClass);
/**
* Returns an object representing the unique location identity of this resolved Java field.
*

19
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaMethod.java
View File

@ -24,6 +24,7 @@ package jdk.vm.ci.meta;
import java.lang.annotation.Annotation;
import java.lang.invoke.MethodHandle;
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Array;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
@ -33,7 +34,7 @@ import java.lang.reflect.Type;
* Represents a resolved Java method. Methods, like fields and types, are resolved through
* {@link ConstantPool constant pools}.
*/
public interface ResolvedJavaMethod extends JavaMethod, InvokeTarget, ModifiersProvider {
public interface ResolvedJavaMethod extends JavaMethod, InvokeTarget, ModifiersProvider, AnnotatedElement {
/**
* Returns the bytecode of this method, if the method has code. The returned byte array does not
@ -188,22 +189,6 @@ public interface ResolvedJavaMethod extends JavaMethod, InvokeTarget, ModifiersP
*/
ConstantPool getConstantPool();
/**
* Returns all annotations of this method. If no annotations are present, an array of length 0
* is returned.
*/
Annotation[] getAnnotations();
/**
* Returns the annotation for the specified type of this method, if such an annotation is
* present.
*
* @param annotationClass the Class object corresponding to the annotation type
* @return this element's annotation for the specified annotation type if present on this
* method, else {@code null}
*/
<T extends Annotation> T getAnnotation(Class<T> annotationClass);
/**
* Returns an array of arrays that represent the annotations on the formal parameters, in
* declaration order, of this method.

20
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaType.java
View File

@ -22,7 +22,7 @@
*/
package jdk.vm.ci.meta;
import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
import jdk.vm.ci.meta.Assumptions.AssumptionResult;
@ -31,7 +31,7 @@ import jdk.vm.ci.meta.Assumptions.AssumptionResult;
* thereof. Types, like fields and methods, are resolved through {@link ConstantPool constant pools}
* .
*/
public interface ResolvedJavaType extends JavaType, ModifiersProvider {
public interface ResolvedJavaType extends JavaType, ModifiersProvider, AnnotatedElement {
/**
* Checks whether this type has a finalizer method.
*
@ -283,22 +283,6 @@ public interface ResolvedJavaType extends JavaType, ModifiersProvider {
*/
ResolvedJavaField[] getStaticFields();
/**
* Returns all annotations of this class. If no annotations are present, an array of length 0 is
* returned.
*/
Annotation[] getAnnotations();
/**
* Returns the annotation for the specified type of this class, if such an annotation is
* present.
*
* @param annotationClass the Class object corresponding to the annotation type
* @return this element's annotation for the specified annotation type if present on this class,
* else {@code null}
*/
<T extends Annotation> T getAnnotation(Class<T> annotationClass);
/**
* Returns the instance field of this class (or one of its super classes) at the given offset,
* or {@code null} if there is no such field.