Skip to content

Commit 6e51b47

Browse files
committed
Add missing JDK8 cp macros
Addresses compilation failure caused by #22974 Signed-off-by: Tobi Ajila <atobia@ca.ibm.com>
1 parent 00e3079 commit 6e51b47

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

jcl/src/java.base/share/classes/java/lang/VMAccess.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@ public boolean getIncludeClassLoaderName(StackTraceElement element) {
277277
public boolean getIncludeModuleVersion(StackTraceElement element) {
278278
return element.getIncludeModuleVersion();
279279
}
280+
/*[ENDIF] JAVA_SPEC_VERSION >= 11 */
280281

281282
/**
282283
* Returns a cached constantPool Object from a given java.lang.Class
@@ -288,5 +289,4 @@ public boolean getIncludeModuleVersion(StackTraceElement element) {
288289
public ConstantPool getConstantPoolCache(Class<?> clazz) {
289290
return clazz.constantPoolObject;
290291
}
291-
/*[ENDIF] JAVA_SPEC_VERSION >= 11 */
292292
}

runtime/oti/vmconstantpool.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,8 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
193193
<fieldref class="java/lang/Class" name="reflectCache" signature="Ljava/lang/Class$ReflectCache;"/>
194194
<fieldref class="java/lang/Class" name="classLoader" signature="Ljava/lang/ClassLoader;"/>
195195
<fieldref class="java/lang/Class" name="vmRef" signature="J" cast="struct J9Class *"/>
196-
<fieldref class="java/lang/Class" name="constantPoolObject" signature="Ljdk/internal/reflect/ConstantPool;"/>
196+
<fieldref class="java/lang/Class" name="constantPoolObject" signature="Ljdk/internal/reflect/ConstantPool;" versions="11-"/>
197+
<fieldref class="java/lang/Class" name="constantPoolObject" signature="Lsun/reflect/ConstantPool;" versions="8"/>
197198
<fieldref class="java/lang/Class" name="initializationLock" signature="Ljava/lang/J9VMInternals$ClassInitializationLock;"/>
198199
<fieldref class="java/lang/Class" name="protectionDomain" signature="Ljava/security/ProtectionDomain;"/>
199200
<fieldref class="java/lang/Class" name="classNameString" signature="Ljava/lang/String;"/>

0 commit comments

Comments
 (0)