Integrated: Merge lworld

Vicente Romero vromero at openjdk.org
Wed Jul 16 19:52:55 UTC 2025


On Wed, 16 Jul 2025 17:55:27 GMT, Vicente Romero <vromero at openjdk.org> wrote:

> Merge branch 'lworld' into lw5_merge_lworld
> # Conflicts:
> #	src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
> #	src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
> #	src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java

src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java line 2556:

> 2554:                 boolean isConstructorPrev = isConstructor;
> 2555:                 boolean isCompactOrGeneratedRecordConstructorPrev = isCompactOrGeneratedRecordConstructor;
> 2556: 		JCMethodDecl currentMethodPrev = currentMethod;

Suggestion:

                JCMethodDecl currentMethodPrev = currentMethod;

src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java line 2632:

> 2630:                     isConstructor = isConstructorPrev;
> 2631:                     isCompactOrGeneratedRecordConstructor = isCompactOrGeneratedRecordConstructorPrev;
> 2632: 		    currentMethod = currentMethodPrev;

Suggestion:

                    currentMethod = currentMethodPrev;

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

PR Review Comment: https://git.openjdk.org/valhalla/pull/1510#discussion_r2211395568
PR Review Comment: https://git.openjdk.org/valhalla/pull/1510#discussion_r2211402082


More information about the valhalla-dev mailing list