Skip to content

Commit

Permalink
8326717: Disable stringop-overflow in shenandoahLock.cpp
Browse files Browse the repository at this point in the history 
Reviewed-by: erikj, shade
  • Loading branch information
@shipilev
Dan Lutker authored and shipilev committed Feb 27, 2024
1 parent ec9437d commit 97aca09
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions make/hotspot/lib/CompileJvm.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJVM, \
DISABLED_WARNINGS_gcc_jvmciCodeInstaller.cpp := stringop-overflow, \
DISABLED_WARNINGS_gcc_jvmtiTagMap.cpp := stringop-overflow, \
DISABLED_WARNINGS_gcc_postaloc.cpp := address, \
DISABLED_WARNINGS_gcc_shenandoahLock.cpp := stringop-overflow, \
DISABLED_WARNINGS_gcc_synchronizer.cpp := stringop-overflow, \
DISABLED_WARNINGS_clang := $(DISABLED_WARNINGS_clang), \
DISABLED_WARNINGS_clang_arguments.cpp := missing-field-initializers, \
Expand Down

3 comments on commit 97aca09

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

Review

Issues

@shipilev
Copy link
Member

Choose a reason for hiding this comment

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

/backport jdk21u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 97aca09 Jun 26, 2024

Choose a reason for hiding this comment

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

@shipilev Could not automatically backport 97aca09e to openjdk/jdk21u-dev due to conflicts in the following files:

  • make/hotspot/lib/CompileJvm.gmk

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk21u-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/jdk21u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-shipilev-97aca09e-master

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

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

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

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

Below you can find a suggestion for the pull request body:

Hi all,

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

The commit being backported was authored by Dan Lutker on 27 Feb 2024 and was reviewed by Erik Joelsson and Aleksey Shipilev.

Thanks!

Please sign in to comment.