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

Merge jdk #402

Closed
wants to merge 271 commits into from
Closed

Merge jdk #402

wants to merge 271 commits into from

Conversation

MrSimms
Copy link
Member

@MrSimms MrSimms commented May 5, 2021

Merge jdk at 20210505


Progress

  • Change must not contain extraneous whitespace

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/valhalla pull/402/head:pull/402
$ git checkout pull/402

Update a local copy of the PR:
$ git checkout pull/402
$ git pull https://git.openjdk.java.net/valhalla pull/402/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 402

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/valhalla/pull/402.diff

Vladimir Ivanov and others added 30 commits Apr 22, 2021
Reviewed-by: mcimadamore, vromero
Reviewed-by: valeriep
Reviewed-by: iwalulya, lkorinth, sjohanss
Reviewed-by: iignatyev, tbell, iris, erikj
…ERROR_INTERNAL(181)"

Reviewed-by: amenkov, dcubed
Reviewed-by: erikj, dholmes, stuefe
Introduce IGV-specific node identifier and encapsulate it in IGV by showing a
configurable 'short node text' string instead.

Reviewed-by: iveresov, kvn
Reviewed-by: ccheung, iklam, iignatyev
tstuefe and others added 11 commits May 5, 2021
… handle wrong mapping address

Reviewed-by: mdoerr
Reviewed-by: stuefe, lfoltan
Reviewed-by: iklam, dholmes, sspitsyn
…d in nmethod_barrier on MacOSX/AArch64

Reviewed-by: rkennke
Reviewed-by: vlivanov, kvn, iignatyev
# Conflicts:
#	src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp
#	src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
#	src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
#	src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp
#	src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp
#	src/hotspot/cpu/x86/macroAssembler_x86.cpp
#	src/hotspot/cpu/x86/templateTable_x86.cpp
#	src/hotspot/share/aot/aotCompiledMethod.hpp
#	src/hotspot/share/cds/cppVtables.cpp
#	src/hotspot/share/classfile/classFileParser.cpp
#	src/hotspot/share/classfile/systemDictionary.hpp
#	src/hotspot/share/code/compiledIC.cpp
#	src/hotspot/share/oops/instanceKlass.cpp
#	src/hotspot/share/oops/instanceKlass.hpp
#	src/hotspot/share/oops/instanceKlass.inline.hpp
#	src/hotspot/share/oops/method.hpp
#	src/hotspot/share/oops/objArrayKlass.cpp
#	src/hotspot/share/opto/matcher.cpp
#	src/hotspot/share/runtime/init.cpp
#	src/hotspot/share/runtime/sharedRuntime.cpp
#	src/hotspot/share/runtime/thread.hpp
#	src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java
#	src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
#	src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CheckGraalIntrinsics.java
#	src/jdk.jdi/share/classes/com/sun/tools/jdi/ArrayTypeImpl.java
#	test/hotspot/jtreg/TEST.groups
#	test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java
#	test/jdk/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java
#	test/jtreg-ext/requires/VMProps.java
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented May 5, 2021

👋 Welcome back dsimms! A progress list of the required criteria for merging this PR into lworld will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

@openjdk openjdk bot commented May 5, 2021

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

Merge jdk

Merge jdk at 20210505

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 no new commits pushed to the lworld branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the lworld branch, type /integrate in a new comment.

@MrSimms
Copy link
Member Author

@MrSimms MrSimms commented May 5, 2021

/summary Merge jdk at 20210505

@openjdk
Copy link

@openjdk openjdk bot commented May 5, 2021

@MrSimms Setting summary to Merge jdk at 20210505

@mlbridge
Copy link

@mlbridge mlbridge bot commented May 5, 2021

@MrSimms
Copy link
Member Author

@MrSimms MrSimms commented May 6, 2021

/integrate

@openjdk openjdk bot closed this May 6, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels May 6, 2021
@openjdk
Copy link

@openjdk openjdk bot commented May 6, 2021

@MrSimms Since your change was applied there have been 2 commits pushed to the lworld branch:

  • b747817: 8266582: [lworld] [lw3] C1 should have a flag to control use of delayed reads of flattened fields
  • f43fafc: 8265973: [lworld] C2 compilation fails due to infinite loop in PhaseIterGVN::optimize

Your commit was automatically rebased without conflicts.

Pushed as commit 65578e1.

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

@MrSimms MrSimms deleted the lworld_merge_20210505 branch Jul 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment