[lworld] RFR: 8378184: [lworld] JDK - Cleanup accidental diffs with master - step 1

Roger Riggs rriggs at openjdk.org
Thu Feb 26 15:56:32 UTC 2026


On Thu, 26 Feb 2026 03:15:36 GMT, Chen Liang <liach at openjdk.org> wrote:

> Reduces some noisy diff with mainline jdk-27+10, checked with Intellij IDEA's Git -> Compare With Branch/Tag on a directory. Some are vestiges of older prototypes.

src/java.base/share/classes/java/lang/Class.java line 231:

> 229:                               TypeDescriptor.OfField<Class<?>>,
> 230:                               Constable {
> 231:     private static final int ANNOTATION= 0x00002000;

This kind of formatting difference should be fixed in the master, not lworld.

src/java.base/share/classes/java/lang/invoke/MemberName.java line 420:

> 418:     static final int SYNTHETIC = 0x00001000;
> 419:     static final int ANNOTATION= 0x00002000;
> 420:     static final int ENUM      = 0x00004000;

This formatting difference should be fixed in the mainline. Though both could be considered incorrect.
zero spaces vs 2 spaces to align the values.

src/java.base/share/classes/jdk/internal/classfile/impl/DirectClassBuilder.java line 173:

> 171:     }
> 172: 
> 173: 

Should be fixed in mainline.

src/java.base/share/classes/jdk/internal/jimage/ImageReader.java line 983:

> 981:         }
> 982:     }
> 983: 

Fix in mainline.

src/java.base/share/classes/jdk/internal/misc/Unsafe.java line 189:

> 187:     public native void putInt(Object o, long offset, int x);
> 188: 
> 189: 

Fix in mainline.

src/java.base/share/native/libjava/Array.c line 2:

> 1: /*
> 2:  * Copyright (c) 1996, 1998, Oracle and/or its affiliates. All rights reserved.

The code was changed and changed back, I think the more recent Copyright dae is still correct (2025).
See https://bugs.openjdk.org/browse/JDK-8209554

-------------

PR Review Comment: https://git.openjdk.org/valhalla/pull/2171#discussion_r2859739399
PR Review Comment: https://git.openjdk.org/valhalla/pull/2171#discussion_r2859748171
PR Review Comment: https://git.openjdk.org/valhalla/pull/2171#discussion_r2859772847
PR Review Comment: https://git.openjdk.org/valhalla/pull/2171#discussion_r2859778591
PR Review Comment: https://git.openjdk.org/valhalla/pull/2171#discussion_r2859782782
PR Review Comment: https://git.openjdk.org/valhalla/pull/2171#discussion_r2859824381


More information about the valhalla-dev mailing list