8335257: Refactor code to create Initialized Assertion Predicates into separate class

[chhagedorn]

trafficstars

This is the next patch for Assertion Predicates. It refactors the code to create an Initialized Assertion Predicate. Changes include:

• clone_assertion_predicate_and_initialize() currently does two things: Cloning a Template Assertion Predicate and creating an Initailized Assertion Predicate. I've split this method into two methods clone_template_assertion_predicate() and create_initialized_assertion_predicate():
  • clone_template_assertion_predicate(): Now only clones the template. I have not cleaned the code up further because I will soon replace the If node with a dedicated TemplateAssertionPredicateNode.
  • create_initialized_assertion_predicate(): I refactored the code for Initialized Assertion Predicate into a separate class InitializedAssertionPredicate which creates the complete Initialized Assertion Predicate If with a HaltNode. I could get rid of some of the arguments because they can be fetched inside the new class methods.
  • Moved assertion_predicate_has_loop_opaque_node() asserts to both methods.
• Renamed AssertionPredicateType::Init_value -> AssertionPredicateType::InitValue (same for last value).

Thanks, Christian

---

Progress

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

Issue

• JDK-8335257: Refactor code to create Initialized Assertion Predicates into separate class (Sub-task - P4)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 19940

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

Using diff file

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

Webrev

Link to Webrev Comment

[bridgekeeper[bot]]

:wave: Welcome back chagedorn! 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[bot]]

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

8335257: Refactor code to create Initialized Assertion Predicates into separate class

Reviewed-by: kvn, epeter

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

• 93c19ac73c2feb8d6191bc5da98b4a9c8e2b5590: 8337219: AccessFlags factories do not require necessary arguments
• 6154a2129ba505b7163a1998792296827a056750: 8336032: Enforce immutability of Lists used by ClassFile API
• a91f9ba84906dae10b050e15307ba0f0f05af3e4: 8301403: Eliminate memory allocations in JVMFlag::printFlags during signal handling
• 2c9fd9016f4675448a62380ff2b86533020e690f: 8336315: tools/jpackage/windows/WinChildProcessTest.java Failed: Check is calculator process is alive
• 1cb27f7e2355ccb911bb274fc004e5bc57fd5dc9: 8334230: Optimize C2 classes layout
• 41486131481164a559aa534807fe1a77a7d29fc8: 8335907: JFR: Make SettingControls more robust
• 79bdd811876d75974536aac088bae1719387c97f: 8336763: Parallel: Merge PCMarkAndPushClosure and PCIterateMarkAndPushClosure
• 8162832832ac6e8c17f942e718e309a3489e0da6: 8333354: ubsan: frame.inline.hpp:91:25: and src/hotspot/share/runtime/frame.inline.hpp:88:29: runtime error: member call on null pointer of type 'const struct SmallRegisterMap'
• 0325ab8d2353f29ac40ff4b028cbc29bff40c59b: 8335610: DiagnosticFramework: CmdLine::is_executable() correction
• 7ac531181c25815577ba2f6f426e1da270e4f589: 8331126: [s390x] secondary_super_cache does not scale well
• ... and 57 more: https://git.openjdk.org/jdk/compare/05d88de05e9b7814ecd5517aacd17f0feafdff3c...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[bot]]

@chhagedorn 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[bot]]

Webrevs

• 03: Full - Incremental (f393edf7)
• 02: Full - Incremental (6f660554)
• 01: Full - Incremental (b43604ab)
• 00: Full (1ce4fdc1)

[chhagedorn]

Pushed another update regarding your follow-up suggestions. As discussed offline, I've also applied the following renaming:

Template Assertion Predicate Expression -> Template Assertion Expression

It's shorter and more clear: It's a template for the Assertion Expression. "Predicate" seems redundant/implicitly implied.

[chhagedorn]

Thanks Emanuel for your careful review!

[chhagedorn]

Just a small side node, I will be on vacation the next two and a half weeks and will only be able to come back to this afterwards.

[chhagedorn]

Thanks Vladimir for your review! I'll run some testing again with latest master before integration.

[chhagedorn]

Testing looked good.

/integrate

[openjdk[bot]]

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

• fbe8a81d1900d0de1920ad1df6ad574f3da4bd51: 8333144: docker tests do not work when ubsan is configured
• dabdae6b355b3e7a2795f6b01ba475652d483288: 8334599: Improve code from JDK-8302671
• 8bd3cd51562ff9e76fa0e3d49d38e6e19210f878: 8337716: ByteBuffer hashCode implementations are inconsistent
• 367e0a65561f95aad61b40930d5f46843fee3444: 8334755: Asymptotically faster implementation of square root algorithm
• 34edc7358f733cdf433d0ff50921bcb5a94c5e35: 8337396: Cleanup usage of ExternalAddess
• 7deee745254e5f32b75a09d84ac5078a122c8b8d: 8335122: Reorganize internal low-level support for HTML in jdk.javadoc
• f2e1205abf915c7f036c58292c6f4d8602cb0e64: 8337676: JFR: Change the label of the throttle setting
• 066db6eb21e9c9202857f9f6adfcd537a0b82160: 8337274: Remove repeated 'the' in StyleSheet.create{Small,Large}AttributeSet
• 328a0533b2ee6793130dfb68d931e0ebd60c6b5d: 8335059: Consider renaming ClassLoaderData::keep_alive
• a89b525189fbc0559be9edc0de9f4288ca676139: 8337721: G1: Remove unused G1CollectedHeap::young_collection_verify_type
• ... and 97 more: https://git.openjdk.org/jdk/compare/05d88de05e9b7814ecd5517aacd17f0feafdff3c...master

Your commit was automatically rebased without conflicts.

[openjdk[bot]]

@chhagedorn Pushed as commit be34730fb4e6818ac13c46b34b735c967351e5cd.

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