Skip to content

Commit e271320

Browse files
committed
Valhalla removes INLINE-TYPES JPP flags according to JavaLangAccess
Removed INLINE-TYPES JPP flags that are not required after merging the latest Valhalla content. Signed-off-by: Jason Feng <[email protected]>
1 parent 206fc9c commit e271320

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ public String newStringUTF8NoRepl(byte[] bytes, int offset, int length) {
383383
}
384384
/*[ENDIF] (10 <= JAVA_SPEC_VERSION) & (JAVA_SPEC_VERSION < 26) */
385385

386-
/*[IF ((10 <= JAVA_SPEC_VERSION) & (JAVA_SPEC_VERSION < 26)) | INLINE-TYPES]*/
386+
/*[IF (10 <= JAVA_SPEC_VERSION) & (JAVA_SPEC_VERSION < 26)]*/
387387
@Override
388388
public byte[] getBytesUTF8NoRepl(String str) {
389389
/*[IF JAVA_SPEC_VERSION < 17]*/
@@ -392,7 +392,7 @@ public byte[] getBytesUTF8NoRepl(String str) {
392392
return String.getBytesUTF8NoRepl(str);
393393
/*[ENDIF] JAVA_SPEC_VERSION < 17 */
394394
}
395-
/*[ENDIF] ((10 <= JAVA_SPEC_VERSION) & (JAVA_SPEC_VERSION < 26)) | INLINE-TYPES */
395+
/*[ENDIF] (10 <= JAVA_SPEC_VERSION) & (JAVA_SPEC_VERSION < 26) */
396396

397397
/*[IF JAVA_SPEC_VERSION >= 11]*/
398398
@Override
@@ -424,7 +424,7 @@ public String newStringNoRepl(byte[] bytes, Charset charset) throws CharacterCod
424424
}
425425
/*[ENDIF] JAVA_SPEC_VERSION < 25 */
426426

427-
/*[IF (JAVA_SPEC_VERSION == 25) | INLINE-TYPES]*/
427+
/*[IF JAVA_SPEC_VERSION == 25]*/
428428
@Override
429429
public byte[] uncheckedGetBytesNoRepl(String str, Charset charset) throws CharacterCodingException {
430430
return String.getBytesNoRepl(str, charset);
@@ -434,7 +434,7 @@ public byte[] uncheckedGetBytesNoRepl(String str, Charset charset) throws Charac
434434
public String uncheckedNewStringNoRepl(byte[] bytes, Charset charset) throws CharacterCodingException {
435435
return String.newStringNoRepl(bytes, charset);
436436
}
437-
/*[ENDIF] (JAVA_SPEC_VERSION == 25) | INLINE-TYPES */
437+
/*[ENDIF] JAVA_SPEC_VERSION == 25 */
438438
/*[ENDIF] JAVA_SPEC_VERSION >= 11 */
439439

440440
/*[IF JAVA_SPEC_VERSION >= 12]*/
@@ -473,7 +473,7 @@ public MethodHandle stringConcatHelper(String arg0, MethodType type) {
473473
return StringConcatHelper.lookupStatic(arg0, type);
474474
}
475475

476-
/*[IF (JAVA_SPEC_VERSION < 26) | INLINE-TYPES]*/
476+
/*[IF JAVA_SPEC_VERSION < 26]*/
477477
@Override
478478
public long stringConcatInitialCoder() {
479479
return StringConcatHelper.initialCoder();
@@ -483,7 +483,7 @@ public long stringConcatInitialCoder() {
483483
public long stringConcatMix(long arg0, String string) {
484484
return StringConcatHelper.mix(arg0, string);
485485
}
486-
/*[ENDIF] (JAVA_SPEC_VERSION < 26) | INLINE-TYPES */
486+
/*[ENDIF] JAVA_SPEC_VERSION < 26 */
487487
/*[ENDIF] JAVA_SPEC_VERSION >= 15 */
488488

489489
/*[IF JAVA_SPEC_VERSION >= 16]*/
@@ -607,12 +607,12 @@ public int stringSize(long x) {
607607
}
608608
/*[ENDIF] JAVA_SPEC_VERSION < 24 */
609609

610-
/*[IF (JAVA_SPEC_VERSION < 26) | INLINE-TYPES]*/
610+
/*[IF JAVA_SPEC_VERSION < 26]*/
611611
@Override
612612
public long stringConcatMix(long lengthCoder, char value) {
613613
return StringConcatHelper.mix(lengthCoder, value);
614614
}
615-
/*[ENDIF] (JAVA_SPEC_VERSION < 26) | INLINE-TYPES */
615+
/*[ENDIF] JAVA_SPEC_VERSION < 26 */
616616

617617
@Override
618618
public PrintStream initialSystemErr() {
@@ -965,7 +965,6 @@ public int getClassFileAccessFlags(Class<?> clazz) {
965965
return clazz.getClassFileAccessFlags();
966966
}
967967

968-
/*[IF !INLINE-TYPES]*/
969968
@Override
970969
public byte[] getBytesUTF8OrThrow(String s) throws CharacterCodingException {
971970
return String.getBytesUTF8OrThrow(s);
@@ -980,7 +979,6 @@ public byte[] uncheckedGetBytesOrThrow(String s, Charset cs) throws CharacterCod
980979
public String uncheckedNewStringOrThrow(byte[] bytes, Charset cs) throws CharacterCodingException {
981980
return String.newStringOrThrow(bytes, cs);
982981
}
983-
/*[ENDIF] !INLINE-TYPES */
984982

985983
@Override
986984
public String uncheckedNewStringWithLatin1Bytes(byte[] src) {

0 commit comments

Comments
 (0)