Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8255810: Zero: build fails without JVMTI #94

Closed
wants to merge 1 commit into from

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Jul 2, 2021

This is an unclean backport. It differs from upstream version by additionally protecting relocate_cached_class_file that stores bytecode for JVMTI use. It was removed later during rewrite in JDK-8218751 (which does not look very backportable, given its bugtail).

Additional testing:

  • Linux x86_64 Zero fastdebug build without JVMTI
  • Linux x86_64 Zero fastdebug, runtime/appcds tests (ignored by jtreg, as CDS is not enabled for Zero)
  • Linux x86_64 Server fastdebug, runtime/appcds tests (still pass)

Progress

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

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/94/head:pull/94
$ git checkout pull/94

Update a local copy of the PR:
$ git checkout pull/94
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/94/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 94

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/94.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 2, 2021

👋 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 openjdk bot changed the title Backport ca216bae1af5b6db0e0aa2bc0c8730711602f9a6 8255810: Zero: build fails without JVMTI Jul 2, 2021
@openjdk
Copy link

openjdk bot commented Jul 2, 2021

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Jul 2, 2021
@mlbridge
Copy link

mlbridge bot commented Jul 2, 2021

Webrevs

Copy link
Member

@tstuefe tstuefe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@openjdk
Copy link

openjdk bot commented Jul 2, 2021

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

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

8255810: Zero: build fails without JVMTI

Reviewed-by: stuefe

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

  • 71f793e: 8266404: Fatal error report generated with -XX:+CrashOnOutOfMemoryError should not contain suggestion to submit a bug report
  • e56abca: 8268366: Incorrect calculation of has_fpu_registers in C1 linear scan
  • 3ed6237: 8269614: [s390] Interpreter checks wrong bit for slow path instance allocation
  • aa79d2b: 8262409: sun/security/ssl/SSLSocketImpl/SSLSocketImplThrowsWrongExceptions. SSL test failures caused by java failed with "Server reported the wrong exception"
  • 65fe466: 8269529: javax/swing/reliability/HangDuringStaticInitialization.java fails in Windows debug build
  • af4b373: 8163326: Update the default enabled cipher suites preference
  • 02bfc22: 8266749: AArch64: Backtracing broken on PAC enabled systems
  • 0e4fdcf: 8254024: Enhance native libs for AWT and Swing to work with GraalVM Native Image
  • 725e516: Merge
  • a24f045: Added tag jdk-11.0.12+6 for changeset 91e81ac08854
  • ... and 14 more: https://git.openjdk.java.net/jdk11u-dev/compare/df587c75bb436b40dd995e39ee0ed952a74b979b...master

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.

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

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jul 2, 2021
@shipilev
Copy link
Member Author

shipilev commented Jul 5, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Jul 5, 2021

Going to push as commit fdaa4f0.
Since your change was applied there have been 31 commits pushed to the master branch:

  • 3f03476: 8224853: CDS address sanitizer errors
  • 65b215a: 8259338: Add expiry exception for identrustdstx3 alias to VerifyCACerts.java test
  • c61cfb5: 8255718: Zero: VM should know it runs in interpreter-only mode
  • 3e09f94: 8260923: Add more tests for SSLSocket input/output shutdown
  • c00a72f: 8253631: Remove unimplemented CompileBroker methods after JEP-165
  • 21345ef: 8269847: JDK-8269594 backport breaks 11u builds
  • 73e987c: 8269594: assert(_handle_mark_nesting > 1) failed: memory leak: allocating handle outside HandleMark
  • 71f793e: 8266404: Fatal error report generated with -XX:+CrashOnOutOfMemoryError should not contain suggestion to submit a bug report
  • e56abca: 8268366: Incorrect calculation of has_fpu_registers in C1 linear scan
  • 3ed6237: 8269614: [s390] Interpreter checks wrong bit for slow path instance allocation
  • ... and 21 more: https://git.openjdk.java.net/jdk11u-dev/compare/df587c75bb436b40dd995e39ee0ed952a74b979b...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Jul 5, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jul 5, 2021
@openjdk
Copy link

openjdk bot commented Jul 5, 2021

@shipilev Pushed as commit fdaa4f0.

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

@shipilev shipilev deleted the JDK-8255810 branch July 5, 2021 08:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
2 participants