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

Closed
wants to merge 622 commits into from
Closed

Merge jdk #316

wants to merge 622 commits into from

Conversation

MrSimms
Copy link
Member

@MrSimms MrSimms commented Jan 28, 2021

Merge to 20210119


Progress

  • Change must not contain extraneous whitespace

Download

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

Alexander Zuev and others added 30 commits Jan 5, 2021
…Exception: Failed to hide opaque button"

Reviewed-by: psadhukhan
Reviewed-by: lfoltan, iklam, coleenp
…er when length of segment is 0

Reviewed-by: chegar, uschindler
…d: value must be a power of 2: 8000000000000000

Reviewed-by: thartmann
…le fields

Reviewed-by: shade, redestad, rriggs, mchung, rrich, alanb
Reviewed-by: cjplummer, sspitsyn
…ort::convert

Co-authored-by: He Xuejin <hexuejin2@huawei.com>
Reviewed-by: vlivanov, thartmann
…/8175301/ScaledFrameBackgroundTest.java' fails

Reviewed-by: serb
…c2/is_jvmci

Reviewed-by: thartmann, chagedorn, shade
…#pagePosition

Co-authored-by: Uwe Schindler <uschindler@openjdk.org>
Reviewed-by: alanb
…all threads

Reviewed-by: eosterlund, coleenp, pchilanomate, sspitsyn
…(s) of statically nested classes

Reviewed-by: jfranck
mrserb and others added 8 commits Jan 19, 2021
…led with "RuntimeException: Test failed: 20 failure(s)"

Reviewed-by: jdv
# Conflicts:
#	.github/workflows/submit.yml
#	make/conf/branding.conf
#	src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp
#	src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
#	src/hotspot/cpu/x86/c1_Runtime1_x86.cpp
#	src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.cpp
#	src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp
#	src/hotspot/cpu/x86/interp_masm_x86.cpp
#	src/hotspot/cpu/x86/macroAssembler_x86.cpp
#	src/hotspot/cpu/x86/macroAssembler_x86.hpp
#	src/hotspot/cpu/x86/x86_64.ad
#	src/hotspot/share/c1/c1_GraphBuilder.cpp
#	src/hotspot/share/c1/c1_LIRAssembler.cpp
#	src/hotspot/share/c1/c1_Runtime1.cpp
#	src/hotspot/share/ci/ciMethod.cpp
#	src/hotspot/share/ci/ciReplay.cpp
#	src/hotspot/share/classfile/classFileParser.cpp
#	src/hotspot/share/classfile/javaClasses.cpp
#	src/hotspot/share/classfile/placeholders.cpp
#	src/hotspot/share/interpreter/interpreterRuntime.cpp
#	src/hotspot/share/logging/logTag.hpp
#	src/hotspot/share/oops/constantPool.cpp
#	src/hotspot/share/oops/instanceKlass.hpp
#	src/hotspot/share/oops/instanceKlass.inline.hpp
#	src/hotspot/share/opto/arraycopynode.cpp
#	src/hotspot/share/opto/callGenerator.cpp
#	src/hotspot/share/opto/callGenerator.hpp
#	src/hotspot/share/opto/callnode.cpp
#	src/hotspot/share/opto/callnode.hpp
#	src/hotspot/share/opto/graphKit.cpp
#	src/hotspot/share/opto/loopnode.cpp
#	src/hotspot/share/opto/memnode.cpp
#	src/hotspot/share/opto/node.cpp
#	src/hotspot/share/opto/parse1.cpp
#	src/hotspot/share/opto/parse2.cpp
#	src/hotspot/share/opto/parseHelper.cpp
#	src/hotspot/share/opto/phaseX.cpp
#	src/hotspot/share/prims/jni.cpp
#	src/hotspot/share/prims/jvm.cpp
#	src/hotspot/share/runtime/globals.hpp
#	src/hotspot/share/runtime/reflection.cpp
#	src/hotspot/share/runtime/sharedRuntime.hpp
#	src/hotspot/share/runtime/synchronizer.cpp
#	src/hotspot/share/utilities/powerOfTwo.hpp
#	src/java.base/share/classes/java/io/ObjectStreamClass.java
#	src/java.base/share/classes/java/lang/Class.java
#	src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java
#	src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
#	src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java
#	src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
#	src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
#	src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
#	src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
#	test/hotspot/jtreg/ProblemList.txt
#	test/hotspot/jtreg/runtime/logging/BiasedLockingTest.java
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jan 28, 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 Jan 28, 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 to 20210119

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

  • 81e6a5a: [lworld] code cleanup reverting some old leftover change
  • a2e8c6b: [lworld] Field::get should return default value instead of null on non-flattened inline field
  • a5d6ed3: 8260375: [lworld] ValueTearing fails with -XX:FlatArrayElementMaxSize=0 -XX:InlineFieldMaxFlatSize=0
  • 2f35fb7: Remove unused field from Method
  • 6d8a8cc: 8260283: [lworld] C1's EliminateFieldAccess optimization fails with "wrong types"
  • 61bdc45: 8260225: [lworld] C1's delayed load indexed optimization sets incorrect type
  • 607c71f: 8260034: [lworld] C1 compilation fails with assert "should not be optimized out"

Please see this link for an up-to-date comparison between the source branch of this pull request and the lworld branch.
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 lworld branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready label Jan 28, 2021
@MrSimms MrSimms marked this pull request as ready for review Feb 3, 2021
@MrSimms
Copy link
Member Author

@MrSimms MrSimms commented Feb 3, 2021

/summary Merge to 20210119

@openjdk openjdk bot added the rfr label Feb 3, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Feb 3, 2021

@MrSimms Setting summary to Merge to 20210119

@MrSimms
Copy link
Member Author

@MrSimms MrSimms commented Feb 3, 2021

/integrate

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

@openjdk openjdk bot commented Feb 3, 2021

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

  • 81e6a5a: [lworld] code cleanup reverting some old leftover change
  • a2e8c6b: [lworld] Field::get should return default value instead of null on non-flattened inline field
  • a5d6ed3: 8260375: [lworld] ValueTearing fails with -XX:FlatArrayElementMaxSize=0 -XX:InlineFieldMaxFlatSize=0
  • 2f35fb7: Remove unused field from Method
  • 6d8a8cc: 8260283: [lworld] C1's EliminateFieldAccess optimization fails with "wrong types"
  • 61bdc45: 8260225: [lworld] C1's delayed load indexed optimization sets incorrect type
  • 607c71f: 8260034: [lworld] C1 compilation fails with assert "should not be optimized out"

Your commit was automatically rebased without conflicts.

Pushed as commit 8569088.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment