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 #319

Closed
wants to merge 232 commits into from
Closed

Merge jdk #319

wants to merge 232 commits into from

Conversation

@MrSimms
Copy link
Member

@MrSimms MrSimms commented Feb 4, 2021

Merge tag 'jdk-17+8' into lworld_merge_jdk_17_8
Logical merge compilation fixes


Progress

  • Change must not contain extraneous whitespace

Download

$ git fetch https://git.openjdk.java.net/valhalla pull/319/head:pull/319
$ git checkout pull/319

YaSuenag and others added 30 commits Jan 19, 2021
Use unbounded wildcard placeholders, plus a new helper to get back to the Reference<T> domain.

Reviewed-by: rkennke, plevart, rriggs, mchung
…:expand_heap_after_young_collection

Reviewed-by: kbarrett, lucy
…[1,2,3] time out without TieredCompilation

Reviewed-by: kvn
Reviewed-by: redestad, lancea
…currentRootScanner::roots_do()

Reviewed-by: shade, rkennke
… compiler flags

Use -march=i686 instead of -march=i586 if -fcf-protection is passed to the build as CMOV is required

Reviewed-by: erikj
Co-authored-by: Xiaohong Gong <xgong@openjdk.org>
Co-authored-by: Igor Ignatyev <iignatyev@openjdk.org>
Reviewed-by: kvn, jiefu
… (OCSP) Nonce Extension

Reviewed-by: jnimeh, mullan
iklam and others added 15 commits Feb 3, 2021
Reviewed-by: alanb, lfoltan, gziemski, ihse
…ression with undefined vars

Reviewed-by: vromero
Allow users to search by node id or name by default, show partial matches when
searching for a specific property, show 'All N matching nodes' entry only if
relevant, and rank results by level of matching.

Co-authored-by: Christian Hagedorn <chagedorn@openjdk.org>
Reviewed-by: chagedorn, vlivanov, xliu
…is added via jcmd

Reviewed-by: kvn, iignatyev
…mpl.m

8257860: [macOS]: Remove JNF dependency from libosxkrb5/SCDynamicStoreConfig.m

Reviewed-by: erikj, prr, ihse, valeriep
…hod could not be enqueued for compilation at level N"

Reviewed-by: dlong, iignatyev
Added tag jdk-17+8 for changeset f025bc1

# Conflicts:
#	src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp
#	src/hotspot/share/c1/c1_Compilation.cpp
#	src/hotspot/share/c1/c1_LIRAssembler.cpp
#	src/hotspot/share/ci/ciInstanceKlass.cpp
#	src/hotspot/share/classfile/classFileParser.cpp
#	src/hotspot/share/classfile/placeholders.hpp
#	src/hotspot/share/classfile/systemDictionary.cpp
#	src/hotspot/share/classfile/systemDictionary.hpp
#	src/hotspot/share/classfile/verificationType.cpp
#	src/hotspot/share/compiler/compileBroker.cpp
#	src/hotspot/share/memory/metaspaceClosure.hpp
#	src/hotspot/share/memory/universe.cpp
#	src/hotspot/share/oops/arrayKlass.cpp
#	src/hotspot/share/oops/objArrayKlass.cpp
#	src/hotspot/share/opto/parse2.cpp
#	src/hotspot/share/prims/jvm.cpp
#	test/hotspot/jtreg/vmTestbase/jit/tiered/Test.java
#	test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessBoolean.java
#	test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessByte.java
#	test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessChar.java
#	test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessDouble.java
#	test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessFloat.java
#	test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessInt.java
#	test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessLong.java
#	test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessShort.java
#	test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessString.java
#	test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestMethodHandleAccess.java.template
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Feb 4, 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 Feb 4, 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 tag 'jdk-17+8'

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.

@openjdk openjdk bot added the ready label Feb 4, 2021
@MrSimms
Copy link
Member Author

@MrSimms MrSimms commented Feb 4, 2021

/summary Merge tag 'jdk-17+8'

@openjdk
Copy link

@openjdk openjdk bot commented Feb 4, 2021

@MrSimms Setting summary to Merge tag 'jdk-17+8'

@MrSimms MrSimms marked this pull request as ready for review Feb 4, 2021
@openjdk openjdk bot added the rfr label Feb 4, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Feb 4, 2021

@MrSimms
Copy link
Member Author

@MrSimms MrSimms commented Feb 4, 2021

/integrate

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

@openjdk openjdk bot commented Feb 4, 2021

@MrSimms Pushed as commit 33dc4fb.

💡 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_jdk_17_8 branch Feb 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment