8295709: Linux AArch64 builds broken after JDK-8294438

[shipilev]

This seems to only manifest with GCC 11+:

* For target hotspot_variant-server_libjvm_objs_assembler_aarch64.o:
/home/shade/trunks/jdk/src/hotspot/cpu/aarch64/assembler_aarch64.cpp: In member function 'void Address::lea(MacroAssembler*, Register) const':
/home/shade/trunks/jdk/src/hotspot/cpu/aarch64/assembler_aarch64.cpp:138:5: error: this 'else' clause does not guard... [-Werror=misleading-indentation]
 138 | else
     | ^~~~
/home/shade/trunks/jdk/src/hotspot/cpu/aarch64/assembler_aarch64.cpp:140:7: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'else'
 140 | break;
     | ^~~~~
cc1plus: all warnings being treated as errors

JDK-8294438 missed this spot, because it was tested with GCC 10.

---

Progress

• Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• Change must not contain extraneous whitespace
• Commit message must refer to an issue

Issue

• JDK-8295709: Linux AArch64 builds broken after JDK-8294438

Reviewers

• David Holmes (@dholmes-ora - Reviewer)
• Andrew Haley (@theRealAph - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/10781/head:pull/10781
$ git checkout pull/10781

Update a local copy of the PR:
$ git checkout pull/10781
$ git pull https://git.openjdk.org/jdk pull/10781/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10781

View PR using the GUI difftool:
$ git pr show -t 10781

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/10781.diff

[bridgekeeper]

👋 Welcome back shade! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[openjdk]

@shipilev The following label will be automatically applied to this pull request:

• hotspot-compiler

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

[mlbridge]

Webrevs

• 00: Full (57a157de)

[dholmes-ora]

Looks good and trivial. Thanks for the quick fix.

[theRealAph]

Yes, trivial.

[openjdk]

@shipilev This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8295709: Linux AArch64 builds broken after JDK-8294438

Reviewed-by: dholmes, aph

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

[shipilev]

Thanks and sorry for breakage. I am looking if there are more breakages on higher GCC versions for other arches too...

/integrate

[openjdk]

Going to push as commit 4f994c0.

[openjdk]

@shipilev Pushed as commit 4f994c0.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.