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 openjdk/jdk:master #15

Merged
merged 420 commits into from Apr 9, 2020
Merged

Merge openjdk/jdk:master #15

merged 420 commits into from Apr 9, 2020

Conversation

@MrSimms
Copy link
Member

@MrSimms MrSimms commented Apr 8, 2020

Merge jdk-15+16 from master


Progress

  • Change must not contain extraneous whitespace

Error

 ⚠️ Could not fetch branch master from project openjdk/jdk - check that they are correct.

Download

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

mrserb and others added 30 commits Feb 27, 2020
…jvm/hotspot/oops/ObjectHeap.java

Reviewed-by: stefank
Throw jtreg.SkippedException instead of failing if shared library isn't unloaded

Reviewed-by: coleenp, lmesnik
Benchmarks for the DatagramChannel::send and DatagramChannel::receive methods

Reviewed-by: alanb, chegar
New ResolvingSignatureStream class provides the capability to easily walk through the differing parts of a signature while resolving or querying its underlying types.

Co-authored-by: John Rose <john.r.rose@oracle.com>
Reviewed-by: coleenp, fparain, hseigel
Change type of gtest object from char[] to unsigned char[].

Reviewed-by: dholmes
New test for MetaspaceAllocationFailure

Reviewed-by: hseigel, stuefe
…n: java.lang.UnsupportedOperationException" exception

Reviewed-by: serb
…s when first shown

Reviewed-by: kizune, pbansal
Andy Herrick and others added 14 commits Mar 27, 2020
C++ EventCompilerPhase/EventCompilerInlining definitions are extended for JVMCI use.

Reviewed-by: dnsimon, egahlin, kvn, mgronlun, thartmann
Reviewed-by: rkennke, cjplummer
…sters before calling keepalive barrier

Reviewed-by: rkennke, smonteith, aph
Reviewed-by: sjohanss, tschatzl
…arks

Reviewed-by: stuefe, ysuenaga, rriggs
# Conflicts:
#	src/hotspot/cpu/x86/macroAssembler_x86.cpp
#	src/hotspot/cpu/x86/x86_64.ad
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 8, 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 Apr 8, 2020

@MrSimms this pull request can no longer be integrated into lworld due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout lworld_merge
git fetch https://git.openjdk.java.net/valhalla lworld
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge lworld"
git push

@MrSimms MrSimms closed this Apr 8, 2020
@MrSimms MrSimms reopened this Apr 8, 2020
@MrSimms MrSimms changed the title Merge jdk-15+16 from master Merge jdk:master Apr 8, 2020
@MrSimms MrSimms changed the title Merge jdk:master Merge openjdk/jdk:master Apr 8, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Apr 8, 2020

@MrSimms This change is no longer ready for integration - check the PR body for details.

@openjdk openjdk bot added the rfr label Apr 8, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 8, 2020

Webrevs

@MrSimms
Copy link
Member Author

@MrSimms MrSimms commented Apr 9, 2020

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Apr 9, 2020

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

  • 1aea5d2: 8242344: [lworld] JDK-8236522 class_list_match_sane() introduced strncpy truncation warnings
  • a264ae9: 8241764: [lworld] TestC2CCalls fails with SIGSEGV in frame::sender_for_compiled_frame
  • d544758: Prototype inline cursors for List
  • 0595ad0: 8235753: [lworld] Handle deoptimization when buffering scalarized inline type args in C1
  • ece2a2d: 8241918: [lworld] Build failures after JDK-8236522
  • 2a6ddbd: 8241910: [lworld] C2 crashes due to duplicate storestore barrier added by JDK-8236522
  • cab7a5b: 8236522: NonTearable marker interface for inline classes
  • 78b0ffd: 8241533: [lworld] PhaseMacroExpand::migrate_outs should be replaced b…

It was not possible to rebase your changes automatically. Please merge lworld into your branch and try again.

@openjdk openjdk bot removed the rfr label Apr 9, 2020
@MrSimms MrSimms merged commit 0c52cfe into openjdk:lworld Apr 9, 2020
1 check failed
@MrSimms MrSimms deleted the lworld_merge branch Apr 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment