Merge pull request #17118 from JasonFengJ9/accessinline

valhalla enable java/lang/Access methods
eclipse-openj9 · Apr 6, 2023 · 4075b02 · 4075b02
2 parents 0ff0696 + 071c73f
commit 4075b02
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/jcl/src/java.base/share/classes/java/lang/Access.java b/jcl/src/java.base/share/classes/java/lang/Access.java
@@ -386,7 +386,7 @@ public String newStringUTF8NoRepl(byte[] bytes, int offset, int length) {
 		/*[IF JAVA_SPEC_VERSION < 17]*/
 		return StringCoding.newStringUTF8NoRepl(bytes, offset, length);
 		/*[ELSE] JAVA_SPEC_VERSION < 17 */
-		/*[IF (JAVA_SPEC_VERSION < 21) | INLINE-TYPES]*/
+		/*[IF JAVA_SPEC_VERSION < 21]*/
 		return String.newStringUTF8NoRepl(bytes, offset, length);
 		/*[ELSE] JAVA_SPEC_VERSION < 21 */
 		return String.newStringUTF8NoRepl(bytes, offset, length, true);
@@ -696,7 +696,7 @@ public <T> void setCarrierThreadLocal(CarrierThreadLocal<T> carrierThreadlocal,
 	}
 /*[ENDIF] JAVA_SPEC_VERSION >= 19 */
 
-/*[IF (JAVA_SPEC_VERSION >= 21) & !INLINE-TYPES]*/
+/*[IF JAVA_SPEC_VERSION >= 21]*/
 	@Override
 	public String getLoaderNameID(ClassLoader loader) {
 		StringBuilder buffer = new StringBuilder();
@@ -714,7 +714,7 @@ public String getLoaderNameID(ClassLoader loader) {
 
 		return buffer.toString();
 	}
-/*[ENDIF] (JAVA_SPEC_VERSION >= 21) & !INLINE-TYPES */
+/*[ENDIF] JAVA_SPEC_VERSION >= 21 */
 
 /*[IF INLINE-TYPES]*/
 	@Override