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

Closed
wants to merge 91 commits into from
Closed

Merge jdk #142

wants to merge 91 commits into from

Conversation

@MrSimms
Copy link
Member

@MrSimms MrSimms commented Aug 11, 2020

Merge tag 'jdk-16+3', notes:

  • Tooks "ours" only for: 8247697 Remove delayed_forbidden dead code in C2, needs reworking
  • Trusted final, now includes inline type fields

Progress

  • Change must not contain extraneous whitespace

Download

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

Patric Hedlin and others added 30 commits Jun 17, 2020
Reviewed-by: aph, neliasso
The fix saves result type from the first pass through the Attr.visitLambda and returns it after recovery pass to avoid NPE caused by exposure of Type.recoveryType

Reviewed-by: mcimadamore
…pilable with JDK15b24

Reviewed-by: jjg, jlaskey
Reviewed-by: rriggs, lancea, darcy
Reviewed-by: ccheung, dcubed
…tMemoryAwareness.java

When the kernel doesn't support swap limits, expect host values instead.

Reviewed-by: mbaesken, bobv, stuefe
…records/StreamRefTest.java

Reviewed-by: rriggs, mchung
Reviewed-by: lancea, darcy
Reviewed-by: mchung, darcy
egahlin and others added 16 commits Jun 23, 2020
Reviewed-by: tschatzl, kbarrett, dholmes
…essing

Reviewed-by: pliden, kbarrett, tschatzl
… processing

Reviewed-by: eosterlund, kbarrett, pliden
Reviewed-by: pliden, eosterlund, kbarrett, tschatzl
…"RuntimeException: 'Unloaded library with handle' missing from stdout/stderr"

Make sure the native library is unloaded before exiting the main thread.

Reviewed-by: dcubed, dholmes
Change CC_INTERP conditional to ZERO and remove in places where unnecessary. Fix build to exclude compilers and rename CppInterpreter to ZeroInterpreter. The "C++ Interpreter" has been removed from the code a while ago.

Reviewed-by: dholmes, ihse
Added tag jdk-16+3 for changeset 76810b3a88c8

# Conflicts:
#	src/hotspot/cpu/aarch64/aarch64.ad
#	src/hotspot/share/prims/jvmtiEnvBase.cpp
#	src/hotspot/share/prims/methodHandles.cpp
#	src/hotspot/share/utilities/growableArray.hpp
#	src/java.base/share/classes/java/lang/invoke/MemberName.java
#	src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java
#	src/java.base/share/classes/java/lang/reflect/AccessibleObject.java
#	src/java.base/share/classes/jdk/internal/reflect/UnsafeFieldAccessorFactory.java
#	src/jdk.unsupported/share/classes/sun/misc/Unsafe.java
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Aug 11, 2020

👋 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.

@openjdk
Copy link

@openjdk openjdk bot commented Aug 11, 2020

@MrSimms This change now passes all automated pre-integration checks, type /integrate in a new comment to proceed. After integration, the commit message will be:

Merge jdk

Merge tag 'jdk-16+3', notes:

* Tooks "ours" only for: 8247697 Remove delayed_forbidden dead code in C2, needs reworking
* Trusted final, now includes inline type fields
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /issue command.

Since the source branch of this PR was last updated there has been 1 commit pushed to the lworld branch:

  • dda358b: 8244233: [lworld] Nested types are not handled properly across projections

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid automatic rebasing, please merge lworld into your branch, and then specify the current head hash when integrating, like this: /integrate dda358bb3773a1886769ea7f8b1328f2382ae3ec.

➡️ 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 Aug 11, 2020

/summary

Merge tag 'jdk-16+3', notes:

  • Tooks "ours" only for: 8247697 Remove delayed_forbidden dead code in C2, needs reworking
  • Trusted final, now includes inline type fields

@openjdk
Copy link

@openjdk openjdk bot commented Aug 11, 2020

@MrSimms Setting summary to:

Merge tag 'jdk-16+3', notes:

* Tooks "ours" only for: 8247697 Remove delayed_forbidden dead code in C2, needs reworking
* Trusted final, now includes inline type fields

@MrSimms
Copy link
Member Author

@MrSimms MrSimms commented Aug 11, 2020

/integrate

@openjdk openjdk bot closed this Aug 11, 2020
@openjdk openjdk bot added integrated and removed ready rfr labels Aug 11, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Aug 11, 2020

@MrSimms The following commits have been pushed to lworld since your change was applied:

  • dda358b: 8244233: [lworld] Nested types are not handled properly across projections

Your commit was automatically rebased without conflicts.

Pushed as commit 93cde00.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Aug 11, 2020

@MrSimms MrSimms deleted the lworld_merge_jdk_16_3 branch Aug 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment