Fix extensions annotation and constantpool inconsistencies

Missing cases from eclipse-openj9/openj9#14063 Signed-off-by: Theresa Mammarella <Theresa.T.Mammarella@ibm.com>
ibmruntimes · Nov 10, 2023 · 6c8473b · 6c8473b
1 parent 6be59e3
commit 6c8473b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/jdk/src/share/classes/java/lang/reflect/Executable.java b/jdk/src/share/classes/java/lang/reflect/Executable.java
@@ -22,6 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+ /*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2023, 2023 All Rights Reserved
+ * ===========================================================================
+ */
 
 package java.lang.reflect;
 
@@ -79,8 +84,7 @@ boolean equalParamTypes(Class<?>[] params1, Class<?>[] params2) {
  Annotation[][] parseParameterAnnotations(byte[] parameterAnnotations) {
  return AnnotationParser.parseParameterAnnotations(
  parameterAnnotations,
- sun.misc.SharedSecrets.getJavaLangAccess().
- getConstantPool(getDeclaringClass()),
+ com.ibm.oti.vm.VM.getConstantPoolFromAnnotationBytes(parameterAnnotations),
  getDeclaringClass());
  }
 
@@ -601,8 +605,7 @@ private Map<Class<? extends Annotation>, Annotation> declaredAnnotations() {
  } else {
  declAnnos = AnnotationParser.parseAnnotations(
  getAnnotationBytes(),
- sun.misc.SharedSecrets.getJavaLangAccess().
- getConstantPool(getDeclaringClass()),
+ com.ibm.oti.vm.VM.getConstantPoolFromAnnotationBytes(getAnnotationBytes()),
  getDeclaringClass()
  );
  }

diff --git a/jdk/src/share/classes/java/lang/reflect/Field.java b/jdk/src/share/classes/java/lang/reflect/Field.java
@@ -22,6 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+ /*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2023, 2023 All Rights Reserved
+ * ===========================================================================
+ */
 
 package java.lang.reflect;
 
@@ -1152,8 +1157,7 @@ private Map<Class<? extends Annotation>, Annotation> declaredAnnotations() {
  } else {
  declAnnos = AnnotationParser.parseAnnotations(
  annotations,
- sun.misc.SharedSecrets.getJavaLangAccess()
- .getConstantPool(getDeclaringClass()),
+ com.ibm.oti.vm.VM.getConstantPoolFromAnnotationBytes(annotations),
  getDeclaringClass());
  }
  declaredAnnotations = declAnnos;

diff --git a/jdk/src/share/classes/java/lang/reflect/Method.java b/jdk/src/share/classes/java/lang/reflect/Method.java
@@ -22,6 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+ /*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2023, 2023 All Rights Reserved
+ * ===========================================================================
+ */
 
 package java.lang.reflect;
 
@@ -605,8 +610,7 @@ public Object getDefaultValue() {
  getReturnType());
  Object result = AnnotationParser.parseMemberValue(
  memberType, ByteBuffer.wrap(annotationDefault),
- sun.misc.SharedSecrets.getJavaLangAccess().
- getConstantPool(getDeclaringClass()),
+ com.ibm.oti.vm.VM.getConstantPoolFromAnnotationBytes(annotationDefault),
  getDeclaringClass());
  if (result instanceof sun.reflect.annotation.ExceptionProxy)
  throw new AnnotationFormatError("Invalid default: " + this);