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

8264151: ciMethod::ensure_method_data() should return false is loading resulted in empty state #3184

Closed
wants to merge 2 commits into from

Conversation

veresov
Copy link
Contributor

@veresov veresov commented Mar 24, 2021

ciMethodData::load_data() can set the state of the MDO to empty (if it's replaying a compile). In this case we should return false from ensure_method_data().


Progress

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

Issue

  • JDK-8264151: ciMethod::ensure_method_data() should return false is loading resulted in empty state

Reviewers

Download

To checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/3184/head:pull/3184
$ git checkout pull/3184

To update a local copy of the PR:
$ git checkout pull/3184
$ git pull https://git.openjdk.java.net/jdk pull/3184/head

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 24, 2021

👋 Welcome back iveresov! 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 added the rfr label Mar 24, 2021
@openjdk
Copy link

openjdk bot commented Mar 24, 2021

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

@openjdk openjdk bot added the hotspot-compiler label Mar 24, 2021
@mlbridge
Copy link

mlbridge bot commented Mar 24, 2021

Webrevs

@dean-long
Copy link
Member

dean-long commented Mar 25, 2021

How about keeping the replay-aware code only in ciMethodData::load_data()? It could return a boolean, then ensure_method_data() can do:

return _method_data->load_data();

and load_data() would do:

#ifndef PRODUCT
  if (ReplayCompiles) {
    ciReplay::initialize(this);
    if (is_empty()) {
      return false;
    }
  }
#endif
  return true;

@veresov
Copy link
Contributor Author

veresov commented Mar 25, 2021

Ok, we can to that.

@openjdk
Copy link

openjdk bot commented Mar 25, 2021

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

8264151: ciMethod::ensure_method_data() should return false is loading resulted in empty state

Reviewed-by: dlong, 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 15 new commits pushed to the master branch:

  • b006f22: 4833719: (bf) Views of MappedByteBuffers are not MappedByteBuffers, and cannot be forced
  • 8307aa6: 8264165: jpackage BasicTest fails after JDK-8220266: Check help text contains plaform specific parameters
  • c037e1e: 8263454: com.apple.laf.AquaFileChooserUI ignores the result of String.trim()
  • a1e717f: 8264146: Make Mutex point to rather than embed _name
  • f69afba: 8263300: add HtmlId for the block containing a class's description.
  • d82464f: 8263528: Make static page ids safe from collision with language elements
  • d602ae0: 8263884: Clean up os::is_allocatable() across Posix platforms
  • a9d287a: 8260388: Listing (sub)packages at package level of API documentation
  • 8120064: 8263781: C2: Cannot hoist independent load above arraycopy
  • 9689863: 8262295: C2: Out-of-Bounds Array Load from Clone Source
  • ... and 5 more: https://git.openjdk.java.net/jdk/compare/3d7f91223ec925e037fa4b22164cc1d0c97d08d9...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 label Mar 25, 2021
@veresov
Copy link
Contributor Author

veresov commented Mar 26, 2021

Thanks for the reviews!

@veresov
Copy link
Contributor Author

veresov commented Mar 26, 2021

/integrate

@openjdk openjdk bot closed this Mar 26, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Mar 26, 2021
@openjdk
Copy link

openjdk bot commented Mar 26, 2021

@veresov Since your change was applied there have been 20 commits pushed to the master branch:

  • 4e708e5: 8260862: JFR: New configure command for the jfr tool
  • 2593196: 8264161: BigDecimal#stripTrailingZeros can throw undocumented ArithmeticException
  • 2a5e0dd: 8262081: vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter001/TestDescription.java failed with "ERROR: eventSet1.size() != 3 :: 2"
  • 374272f: 8261502: ECDHKeyAgreement: Allows alternate ECPrivateKey impl and revised exception handling
  • dbc9e4b: 8253795: Implementation of JEP 391: macOS/AArch64 Port
  • b006f22: 4833719: (bf) Views of MappedByteBuffers are not MappedByteBuffers, and cannot be forced
  • 8307aa6: 8264165: jpackage BasicTest fails after JDK-8220266: Check help text contains plaform specific parameters
  • c037e1e: 8263454: com.apple.laf.AquaFileChooserUI ignores the result of String.trim()
  • a1e717f: 8264146: Make Mutex point to rather than embed _name
  • f69afba: 8263300: add HtmlId for the block containing a class's description.
  • ... and 10 more: https://git.openjdk.java.net/jdk/compare/3d7f91223ec925e037fa4b22164cc1d0c97d08d9...master

Your commit was automatically rebased without conflicts.

Pushed as commit fe8ef32.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-compiler integrated
3 participants