8258856: VM build without C1/C2 fails after JDK-8243205 #1876

shqking · 2020-12-23T05:48:10Z

The declaration sites for JVM flags were changed by JDK-8243205 and the
subsequent JDK-8258074. As a result, undeclared identifier errors
occurred while building VM without compiler1 or compiler2 feature.

Making the corresponding header files included would fix it.

Note that we have tested locally with this patch, build without C1/C2 succeeded on Linux X86/AArch64 machines.

Progress

Change must not contain extraneous whitespace
Commit message must refer to an issue
Change must be properly reviewed

Issue

JDK-8258856: VM build without C1/C2 fails after JDK-8243205

Reviewers

Jie Fu (@DamonFool - Committer)
Vladimir Kozlov (@vnkozlov - Reviewer)

Download

$ git fetch https://git.openjdk.java.net/jdk pull/1876/head:pull/1876
$ git checkout pull/1876

The declaration sites for JVM flags were changed by JDK-8243205 and the subsequent JDK-8258074. As a result, undeclared identifier errors occurred while building VM without compiler1 or compiler2 feature. Making the corresponding header files included would fix it.

bridgekeeper · 2020-12-23T05:48:58Z

👋 Welcome back shqking! 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 · 2020-12-23T05:49:47Z

@shqking 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.

shqking · 2020-12-23T05:50:03Z

/label add build

openjdk · 2020-12-23T05:50:27Z

@shqking
The build label was successfully added.

mlbridge · 2020-12-23T05:53:04Z

Webrevs

src/hotspot/cpu/x86/stubGenerator_x86_64.cpp

src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp

Check the compilation condition INCLUDE_JVMCI before trying to include the header file, i.e. jvmci_globals.hpp, for stubGenerator_x86_64.cpp In jvmciCompilerToVMInit.cpp, remove the redundant header jvmci_globals.hpp since it is already included by compiler_globals.hpp Change-Id: I8858d4ca94b6d12396db6bbebf226b351b5f230a CustomizedGitHooks: yes

src/hotspot/share/compiler/oopMap.cpp

Check the compilation condition INCLUDE_JVMCI before trying to include the header file, i.e. jvmci_globals.hpp, for oopMap.cpp Change-Id: I9885291d9f971984d83942669a22ee030722a206 CustomizedGitHooks: yes

DamonFool

LGTM
Thanks for the update.

vnkozlov

Good.

openjdk · 2020-12-23T18:37:19Z

@shqking 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:

8258856: VM build without C1/C2 fails after JDK-8243205

Reviewed-by: jiefu, kvn

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 6 new commits pushed to the master branch:

fda0943: 8258839: Remove JVM option ExitVMOnVerifyError
cd94606: 8258186: Replace use of JNI_COMMIT mode with mode 0
e46edb5: 8258911: ProblemList serviceability/attach/RemovingUnixDomainSocketTest.java on Linux-X64
91244cc: 8258557: Deproblemlist fixed problemlisted test
2445735: 8258837: Remove JVM option DisableStartThread
a4e082e: 8253368: TLS connection always receives close_notify exception

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@DamonFool, @vnkozlov) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

shqking · 2020-12-23T20:53:15Z

/integrate

openjdk · 2020-12-23T20:53:45Z

@shqking
Your change (at version 1cb5821) is now ready to be sponsored by a Committer.

DamonFool · 2020-12-23T23:14:12Z

/sponsor

openjdk · 2020-12-23T23:14:52Z

@DamonFool @shqking Since your change was applied there have been 7 commits pushed to the master branch:

78c9fb9: 8258851: Mismatch in SunPKCS11 provider registration properties and actual implementation
fda0943: 8258839: Remove JVM option ExitVMOnVerifyError
cd94606: 8258186: Replace use of JNI_COMMIT mode with mode 0
e46edb5: 8258911: ProblemList serviceability/attach/RemovingUnixDomainSocketTest.java on Linux-X64
91244cc: 8258557: Deproblemlist fixed problemlisted test
2445735: 8258837: Remove JVM option DisableStartThread
a4e082e: 8253368: TLS connection always receives close_notify exception

Your commit was automatically rebased without conflicts.

Pushed as commit cdb487a.

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

dholmes-ora · 2020-12-24T06:16:50Z

Just an observation but it seems to me that if we are not including C1 or C2 in a build (ie interpreter-only) then really the build system should not be building the source files that had to be fixed.

David

shqking · 2020-12-24T06:53:47Z

Just an observation but it seems to me that if we are not including C1 or C2 in a build (ie interpreter-only) then really the build system should not be building the source files that had to be fixed.

David

Hi David,
I guess "not including C1 or C2 in a build (ie interpreter-only)" refers to the zero build.
Yes. Regarding zero build, these source files fixed in this patch would not be compiled.

However, the build failures this patch aimed to address are 'server build without C1 feature' and 'server build without C2 feature'.
'C1/C2' in the title of this PR means 'build without C1' or 'build without C2'.

As stated in JDK-8258856, the build failures can be reproduced by
./configure --with-jvm-features=-compiler1 && make images
and ./configure --with-jvm-features=-compiler2 && make images respectively.

Hope that I made myself understood. Thanks.
Hao

mlbridge · 2020-12-26T09:40:55Z

Mailing list message from David Holmes on build-dev:

Hi Hao,

On 24/12/2020 4:56 pm, Hao Sun wrote:

On Thu, 24 Dec 2020 06:16:50 GMT, David Holmes <dholmes at openjdk.org> wrote:

Just an observation but it seems to me that if we are not including C1 or C2 in a build (ie interpreter-only) then really the build system should not be building the source files that had to be fixed.

David

Hi David,
I guess "not including C1 or C2 in a build (ie interpreter-only)" refers to the zero build.
Yes. Regarding zero build, these source files fixed in this patch would not be compiled.

However, the build failures this patch aimed to address are 'server build without C1 feature' and 'server build without C2 feature'.
'C1/C2' in the title of this PR means 'build without C1' or 'build without C2'.

Sorry I did misunderstand the context of the problem. And my comment was
wrong as JVMCI can be used to replace C1 and/or C2, so a build without
both them need not be interpreter-only.

David

openjdk bot added the rfr Pull request is ready for review label Dec 23, 2020

openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Dec 23, 2020

openjdk bot added the build build-dev@openjdk.org label Dec 23, 2020

DamonFool suggested changes Dec 23, 2020

View reviewed changes

src/hotspot/cpu/x86/stubGenerator_x86_64.cpp Outdated Show resolved Hide resolved

src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp Outdated Show resolved Hide resolved

DamonFool reviewed Dec 23, 2020

View reviewed changes

src/hotspot/share/compiler/oopMap.cpp Outdated Show resolved Hide resolved

Use JVMCI compilation condition for oopMap.cpp

1cb5821

Check the compilation condition INCLUDE_JVMCI before trying to include the header file, i.e. jvmci_globals.hpp, for oopMap.cpp Change-Id: I9885291d9f971984d83942669a22ee030722a206 CustomizedGitHooks: yes

DamonFool approved these changes Dec 23, 2020

View reviewed changes

vnkozlov approved these changes Dec 23, 2020

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Dec 23, 2020

openjdk bot added the sponsor Pull request is ready to be sponsored label Dec 23, 2020

openjdk bot closed this Dec 23, 2020

openjdk bot added integrated Pull request has been integrated and removed sponsor Pull request is ready to be sponsored ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 23, 2020

shqking deleted the without-c1-c2 branch December 24, 2020 00:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8258856: VM build without C1/C2 fails after JDK-8243205 #1876

8258856: VM build without C1/C2 fails after JDK-8243205 #1876

shqking commented Dec 23, 2020 •

edited by openjdk bot

Loading

bridgekeeper bot commented Dec 23, 2020

openjdk bot commented Dec 23, 2020

shqking commented Dec 23, 2020 •

edited

Loading

openjdk bot commented Dec 23, 2020

mlbridge bot commented Dec 23, 2020 •

edited

Loading

DamonFool left a comment

vnkozlov left a comment

openjdk bot commented Dec 23, 2020 •

edited

Loading

shqking commented Dec 23, 2020

openjdk bot commented Dec 23, 2020

DamonFool commented Dec 23, 2020

openjdk bot commented Dec 23, 2020

dholmes-ora commented Dec 24, 2020

shqking commented Dec 24, 2020

mlbridge bot commented Dec 26, 2020

8258856: VM build without C1/C2 fails after JDK-8243205 #1876

8258856: VM build without C1/C2 fails after JDK-8243205 #1876

Conversation

shqking commented Dec 23, 2020 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Download

bridgekeeper bot commented Dec 23, 2020

openjdk bot commented Dec 23, 2020

shqking commented Dec 23, 2020 • edited Loading

openjdk bot commented Dec 23, 2020

mlbridge bot commented Dec 23, 2020 • edited Loading

Webrevs

DamonFool left a comment

Choose a reason for hiding this comment

vnkozlov left a comment

Choose a reason for hiding this comment

openjdk bot commented Dec 23, 2020 • edited Loading

shqking commented Dec 23, 2020

openjdk bot commented Dec 23, 2020

DamonFool commented Dec 23, 2020

openjdk bot commented Dec 23, 2020

dholmes-ora commented Dec 24, 2020

shqking commented Dec 24, 2020

mlbridge bot commented Dec 26, 2020

shqking commented Dec 23, 2020 •

edited by openjdk bot

Loading

shqking commented Dec 23, 2020 •

edited

Loading

mlbridge bot commented Dec 23, 2020 •

edited

Loading

openjdk bot commented Dec 23, 2020 •

edited

Loading