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

8263649: AArch64: update cas.m4 to match current AD file #3045

Closed
wants to merge 3 commits into from

Conversation

nick-arm
Copy link
Contributor

@nick-arm nick-arm commented Mar 17, 2021

There's a block of code in aarch64.ad that was generated from cas.m4 and
is surrounded by:

  // BEGIN This section of the file is automatically generated. Do not edit --------------

However this section has been modified several times since it was
generated and no longer matches the output of the M4 file. This patch
updates cas.m4 to reflect the current code.


Progress

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

Issue

  • JDK-8263649: AArch64: update cas.m4 to match current AD file

Reviewers

Download

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

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

There's a block of code in aarch64.ad that was generated from cas.m4 and
is surrounded by:

  // BEGIN This section of the file is automatically generated. Do not edit --------------

However this section has been modified several times since it was
generated and no longer matches the output of the M4 file. This patch
updates cas.m4 to reflect the current code.
@bridgekeeper
Copy link

bridgekeeper bot commented Mar 17, 2021

👋 Welcome back ngasson! 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 Pull request is ready for review label Mar 17, 2021
@openjdk
Copy link

openjdk bot commented Mar 17, 2021

@nick-arm 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 hotspot-compiler-dev@openjdk.org label Mar 17, 2021
@mlbridge
Copy link

mlbridge bot commented Mar 17, 2021

Webrevs

Copy link
Contributor

@theRealAph theRealAph left a comment

Choose a reason for hiding this comment

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

Thanks! Please update cas.m4 to sprinkle every single generated pattern with something like

  // This encoding class is generated automatically from cas.m4.
  // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE

@nick-arm
Copy link
Contributor Author

Thanks! Please update cas.m4 to sprinkle every single generated pattern with something like

Sure, done.

Copy link
Contributor

@theRealAph theRealAph left a comment

Choose a reason for hiding this comment

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

Thanks for fixing this. Great work.

@openjdk
Copy link

openjdk bot commented Mar 23, 2021

@nick-arm 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:

8263649: AArch64: update cas.m4 to match current AD file

Reviewed-by: aph

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

  • fd3a33a: 8263189: C2: assert(!had_error) failed: bad dominance
  • 7b81f8e: 8263915: runtime/cds/appcds/MismatchedPathTriggerMemoryRelease.java fails when UseCompressedClassPointers is off
  • 2da882c: 8262465: Very long compilation times and high memory consumption in C2 debug builds
  • 0b03d04: 8167015: compiler/codecache/jmx/PoolsIndependenceTest.java timeout
  • df01b15: 8263977: GTK L&F: Cleanup duplicate checks in GTKStyle and GTKLookAndFeel
  • 57d8f1d: 8263985: BCEscapeAnalyzer::invoke checks target->is_loaded() twice
  • 4ef7c67: 8263979: Cleanup duplicate check in Unicode.contains
  • 289d48a: 8261673: Move javadoc for the lookup mechanism to module-info
  • 7b6efd3: 8263904: compiler/intrinsics/bmi/verifycode/BzhiTestI2L.java fails on x86_32
  • 036ae0e: 8225438: javax/net/ssl/TLSCommon/TestSessionLocalPrincipal.java failed with Read timed out
  • ... and 86 more: https://git.openjdk.java.net/jdk/compare/d1baed677e30d33522033c2205138b33e8d392b6...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 Mar 23, 2021
@nick-arm
Copy link
Contributor Author

/integrate

@openjdk openjdk bot closed this Mar 23, 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 Mar 23, 2021
@openjdk
Copy link

openjdk bot commented Mar 23, 2021

@nick-arm Since your change was applied there have been 96 commits pushed to the master branch:

  • fd3a33a: 8263189: C2: assert(!had_error) failed: bad dominance
  • 7b81f8e: 8263915: runtime/cds/appcds/MismatchedPathTriggerMemoryRelease.java fails when UseCompressedClassPointers is off
  • 2da882c: 8262465: Very long compilation times and high memory consumption in C2 debug builds
  • 0b03d04: 8167015: compiler/codecache/jmx/PoolsIndependenceTest.java timeout
  • df01b15: 8263977: GTK L&F: Cleanup duplicate checks in GTKStyle and GTKLookAndFeel
  • 57d8f1d: 8263985: BCEscapeAnalyzer::invoke checks target->is_loaded() twice
  • 4ef7c67: 8263979: Cleanup duplicate check in Unicode.contains
  • 289d48a: 8261673: Move javadoc for the lookup mechanism to module-info
  • 7b6efd3: 8263904: compiler/intrinsics/bmi/verifycode/BzhiTestI2L.java fails on x86_32
  • 036ae0e: 8225438: javax/net/ssl/TLSCommon/TestSessionLocalPrincipal.java failed with Read timed out
  • ... and 86 more: https://git.openjdk.java.net/jdk/compare/d1baed677e30d33522033c2205138b33e8d392b6...master

Your commit was automatically rebased without conflicts.

Pushed as commit 851474a.

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

@nick-arm nick-arm deleted the 8263649 branch March 23, 2021 10:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated
2 participants