8358330: AsmRemarks and DbgStrings clear() method may not get called before their destructor

[ashu-mehra]

This patch fixes a possible assert in debug builds if the allocation of memory for a CodeBlob fails when loading it from the AOT Code Cache. See description of JDK-8358330 for more details.

---

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-8358330: AsmRemarks and DbgStrings clear() method may not get called before their destructor (Bug - P4)

Reviewers

• Vladimir Kozlov (@vnkozlov - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 25598

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

Using diff file

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

Using Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back asmehra! 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]

@ashu-mehra 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:

8358330: AsmRemarks and DbgStrings clear() method may not get called before their destructor

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

• 0352477: 8357660: [JVMCI] Add support for retrieving all BootstrapMethodInvocations directly from ConstantPool
• a653ff4: 8358536: jdk/jfr/api/consumer/TestRecordingFileWrite.java times out
• 248341d: 8344942: Template-Based Testing Framework
• ... and 37 more: https://git.openjdk.org/jdk/compare/faf19abd312ac461f9f74035fec61af7d834ffc1...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]

@ashu-mehra 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

• 01: Full - Incremental (889286b9)
• 00: Full (6869d630)

[ashu-mehra]

@vnkozlov can you please review.

[vnkozlov]

I am not comfortable that you are changing code not used by AOT.
Can you consider populate CodeBlob::_asm_remarks and _dbg_strings after calling CodeBlob::create()? Then you don't need temporary AsmRemarks and DbgStrings.

[ashu-mehra]

Can you consider populate CodeBlob::_asm_remarks and _dbg_strings after calling CodeBlob::create()? Then you don't need temporary AsmRemarks and DbgStrings.

That would work as well. CodeBlob::_asm_remarks::_remarks need to be allocated memory explicitly in this case. I will add AsmRemarks::init() to allocate memory for and initialize AsmRemarks::_remarks.

[openjdk]

@ashu-mehra this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout JDK-8358330
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

[ashu-mehra]

@vnkozlov I have updated the changes. Can you please review again.

[vnkozlov]

Good. Let me test it.

[vnkozlov]

My testing passed.

[ashu-mehra]

@vnkozlov thanks for testing and reviewing.

[ashu-mehra]

/integrate

[openjdk]

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

• 8a79ac8: 8358449: Locale.getISOCountries does not specify the returned set is unmodifiable
• ef47635: 8358015: Fix SequencedMap sequenced view method specifications
• c909216: 8357443: ZGC: Optimize old page iteration in remap remembered phase
• ... and 43 more: https://git.openjdk.org/jdk/compare/faf19abd312ac461f9f74035fec61af7d834ffc1...master

Your commit was automatically rebased without conflicts.

[openjdk]

@ashu-mehra Pushed as commit fd0ab04.

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