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

Closed
wants to merge 572 commits into from
Closed

Merge jdk #446

wants to merge 572 commits into from

Conversation

@MrSimms
Copy link
Member

@MrSimms MrSimms commented Jun 16, 2021

Includes

  • Version flip fixes
  • Dropped JDK-8267151, reimplementation bug: JDK-8268945
  • Dropped JDK-8266015, reimplementation bug: JDK-8268946

Progress

  • Change must not contain extraneous whitespace

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 446

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

Using diff file

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

dfuch and others added 30 commits May 28, 2021
…ith "IOException: No buffer space available"

Reviewed-by: chegar
…s already in use" BindException

Reviewed-by: dfuchs
…) calls

Reviewed-by: pchilanomate, coleenp
Reviewed-by: serb, prr
Reviewed-by: stefank, dcubed, ysuenaga, dholmes
Reviewed-by: kbarrett, eosterlund, dholmes, kvn
…on SVE backend

Co-authored-by: Wang Huang <whuang@openjdk.org>
Co-authored-by: Ai Jiaming <aijiaming1@huawei.com>
Reviewed-by: aph, neliasso
…pport

Reviewed-by: dfuchs, jiefu, alanb, vtewari
Reviewed-by: stefank, tschatzl
…g page size

Reviewed-by: tschatzl, kbarrett
Reviewed-by: iwalulya, ayang, tschatzl
…ateCheckPackageAccess()

Reviewed-by: alanb, mchung
…ssions

Reviewed-by: darcy, chegar, naoto, iris, dfuchs, lancea, vtewari
Reviewed-by: eosterlund, tschatzl
Reviewed-by: neliasso, thartmann
Reviewed-by: thartmann, neliasso
albertnetymk and others added 13 commits Jun 10, 2021
Co-authored-by: Kim Barrett <kbarrett@openjdk.org>
Reviewed-by: kbarrett, sjohanss, tschatzl
8267632: Add source 18 and target 18 to javac
8267631: Add SourceVersion.RELEASE_18

Reviewed-by: iris, erikj, dholmes
Reviewed-by: dholmes, sgehwolf, sspitsyn
… traces for cores and live processes

Reviewed-by: iignatyev
Reviewed-by: whuang, neliasso, ysuenaga
Added tag jdk-18+1 for changeset df65237

# Conflicts:
#	make/conf/version-numbers.conf
#	src/hotspot/cpu/aarch64/aarch64.ad
#	src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp
#	src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp
#	src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp
#	src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
#	src/hotspot/share/c1/c1_GraphBuilder.cpp
#	src/hotspot/share/c1/c1_Instruction.cpp
#	src/hotspot/share/ci/ciInstanceKlass.cpp
#	src/hotspot/share/ci/ciMethod.hpp
#	src/hotspot/share/classfile/classFileParser.cpp
#	src/hotspot/share/classfile/verifier.cpp
#	src/hotspot/share/code/codeBlob.hpp
#	src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.cpp
#	src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.hpp
#	src/hotspot/share/gc/z/zBarrierSet.inline.hpp
#	src/hotspot/share/oops/constantPool.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.cpp
#	src/hotspot/share/oops/oop.cpp
#	src/hotspot/share/opto/arraycopynode.cpp
#	src/hotspot/share/opto/callnode.cpp
#	src/hotspot/share/opto/callnode.hpp
#	src/hotspot/share/opto/compile.cpp
#	src/hotspot/share/opto/library_call.cpp
#	src/hotspot/share/opto/loopUnswitch.cpp
#	src/hotspot/share/opto/loopopts.cpp
#	src/hotspot/share/opto/matcher.cpp
#	src/hotspot/share/prims/jvmtiRedefineClasses.cpp
#	src/hotspot/share/prims/unsafe.cpp
#	src/hotspot/share/runtime/sharedRuntime.cpp
#	src/hotspot/share/runtime/stubRoutines.cpp
#	src/hotspot/share/runtime/stubRoutines.hpp
#	src/hotspot/share/runtime/synchronizer.cpp
#	src/hotspot/share/utilities/accessFlags.hpp
#	src/java.base/share/classes/java/lang/Class.java
#	src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java
#	src/java.base/share/classes/jdk/internal/misc/Unsafe.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/Flow.java
#	src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
#	src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
#	test/jtreg-ext/requires/VMProps.java
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jun 16, 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 Jun 16, 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-18+1'

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

  • 6215bc5: 8268671: [lworld] Wrong code generated for PrimitiveClass.ref.default

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.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Jun 16, 2021

@MrSimms
Copy link
Member Author

@MrSimms MrSimms commented Jun 17, 2021

/summary Merge tag 'jdk-18+1'

@MrSimms
Copy link
Member Author

@MrSimms MrSimms commented Jun 17, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Jun 17, 2021

@MrSimms Setting summary to Merge tag 'jdk-18+1'

@openjdk
Copy link

@openjdk openjdk bot commented Jun 17, 2021

Going to push as commit 00034f1.
Since your change was applied there has been 1 commit pushed to the lworld branch:

  • 6215bc5: 8268671: [lworld] Wrong code generated for PrimitiveClass.ref.default

Your commit was automatically rebased without conflicts.

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

@openjdk openjdk bot commented Jun 17, 2021

@MrSimms Pushed as commit 00034f1.

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