Skip to content

Commit

Permalink
8305711: Arm: C2 always enters slowpath for monitorexit
Browse files Browse the repository at this point in the history
Reviewed-by: shade, kvn
  • Loading branch information
tstuefe committed Apr 7, 2023
1 parent ce6e746 commit c67bbce
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/hotspot/cpu/arm/c2_MacroAssembler_arm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ void C2_MacroAssembler::fast_unlock(Register Roop, Register Rbox, Register Rscra
// Restore the object header
bool allow_fallthrough_on_failure = true;
bool one_shot = true;
cas_for_lock_release(Rmark, Rbox, Roop, Rscratch, done, allow_fallthrough_on_failure, one_shot);
cas_for_lock_release(Rbox, Rmark, Roop, Rscratch, done, allow_fallthrough_on_failure, one_shot);

bind(done);
}
Expand Down

5 comments on commit c67bbce

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@tstuefe
Copy link
Member Author

@tstuefe tstuefe commented on c67bbce Apr 7, 2023

Choose a reason for hiding this comment

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

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on c67bbce Apr 7, 2023

Choose a reason for hiding this comment

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

@tstuefe the backport was successfully created on the branch tstuefe-backport-c67bbcea in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit c67bbcea from the openjdk/jdk repository.

The commit being backported was authored by Thomas Stuefe on 7 Apr 2023 and was reviewed by Aleksey Shipilev and Vladimir Kozlov.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev.git tstuefe-backport-c67bbcea:tstuefe-backport-c67bbcea
$ git checkout tstuefe-backport-c67bbcea
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev.git tstuefe-backport-c67bbcea

@tstuefe
Copy link
Member Author

@tstuefe tstuefe commented on c67bbce Apr 8, 2023

Choose a reason for hiding this comment

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

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on c67bbce Apr 8, 2023

Choose a reason for hiding this comment

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

@tstuefe Could not automatically backport c67bbcea to openjdk/jdk11u-dev due to conflicts in the following files:

  • src/hotspot/cpu/arm/c2_MacroAssembler_arm.cpp

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk11u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk11u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b tstuefe-backport-c67bbcea

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git c67bbcea92919fea9b6f7bbcde8ba4488289d174

# Backport the commit
$ git cherry-pick --no-commit c67bbcea92919fea9b6f7bbcde8ba4488289d174
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport c67bbcea92919fea9b6f7bbcde8ba4488289d174'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk11u-dev with the title Backport c67bbcea92919fea9b6f7bbcde8ba4488289d174.

Please sign in to comment.