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

Closed
wants to merge 99 commits into from
Closed

Merge jdk #164

wants to merge 99 commits into from

Conversation

@MrSimms
Copy link
Member

@MrSimms MrSimms commented Aug 24, 2020

Merge tag 'jdk-16+6' into lworld_merge_jdk_16_6
Added tag jdk-16+6 for changeset 4a8fd81d64ba

Conflicts:

src/hotspot/cpu/aarch64/aarch64.ad

src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp

src/hotspot/share/classfile/classFileParser.cpp

src/hotspot/share/runtime/globals.hpp


Progress

  • Change must not contain extraneous whitespace

Download

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

Sean Mullan and others added 30 commits Jan 14, 2020
Reviewed-by: weijun, rhalade, mschoene
Reviewed-by: weijun, rhalade, mschoene
Reviewed-by: alitvinov, prr, ahgross, rhalade
Reviewed-by: alanb, ahgross, redestad, coffeys, mschoene, rhalade
Reviewed-by: weijun, mschoene, rhalade
Reviewed-by: alanb, ahgross, rhalade, rriggs
Reviewed-by: lancea, dfuchs, mschoene, rhalade, aefimov
Reviewed-by: serb, erikj, mschoene, rhalade
Reviewed-by: prr, bpb, mschoene, rhalade
Reviewed-by: dfuchs, naoto, mschoene, rhalade
Reviewed-by: jnimeh, weijun, ahgross, rhalade
Reviewed-by: prr, amenkov, rhalade, mschoene
Reviewed-by: serb, bpb, mschoene, rhalade
Reviewed-by: alanb, ahgross, rhalade, psandoz
Reviewed-by: rriggs, mullan, ahgross, rhalade
Reviewed-by: amenkov, rhalade, mschoene, prr
Reviewed-by: never, dnsimon, kvn, ahgross, rhalade
Reviewed-by: serb, psadhukhan, mschoene, rhalade
Reviewed-by: ahgross, mullan, rhalade
Reviewed-by: dfuchs, alanb, rhalade, mullan
Reviewed-by: alanb, rhalade, ahgross, igerasim
Reviewed-by: lancea, dfuchs, skoivu, rhalade, kravikumar
Reviewed-by: sspitsyn, jwilhelm, mschoene, rhalade
Reviewed-by: chegar, rhalade, skoivu
Reviewed-by: xuelei, mullan, rhalade, ahgross
Check runtime classpath lengths after calling create_path_array().

Reviewed-by: iklam, minqi
Reviewed-by: cjplummer, sspitsyn
erikj79 and others added 16 commits Jul 14, 2020
…JVMTI function return error

Reviewed-by: sspitsyn, cjplummer
Added tag jdk-16+6 for changeset 4a8fd81d64ba

# Conflicts:
#	src/hotspot/cpu/aarch64/aarch64.ad
#	src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
#	src/hotspot/share/classfile/classFileParser.cpp
#	src/hotspot/share/runtime/globals.hpp
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Aug 24, 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 24, 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 'jdk-16+6'
  • 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:

  • 4ab5388: 8252227: [lworld] Merge of jdk-16+5 broke compiler/arraycopy/TestEliminateArrayCopy.java

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 4ab5388ba95b0de489972c2d0729393ef9dd7838.

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

/summary Merge 'jdk-16+6'

@openjdk
Copy link

@openjdk openjdk bot commented Aug 24, 2020

@MrSimms Setting summary to Merge 'jdk-16+6'

@MrSimms
Copy link
Member Author

@MrSimms MrSimms commented Aug 24, 2020

/integrate

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

@openjdk openjdk bot commented Aug 24, 2020

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

  • 4ab5388: 8252227: [lworld] Merge of jdk-16+5 broke compiler/arraycopy/TestEliminateArrayCopy.java

Your commit was automatically rebased without conflicts.

Pushed as commit a8215ec.

@MrSimms MrSimms deleted the lworld_merge_jdk_16_6 branch Aug 24, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Aug 24, 2020

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