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

Closed
wants to merge 41 commits into from
Closed

Merge jdk #88

wants to merge 41 commits into from

Conversation

@MrSimms
Copy link
Member

@MrSimms MrSimms commented Jun 17, 2020

Merge jdk-16+1


Progress

  • Change must not contain extraneous whitespace

Download

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

Iris Clark and others added 30 commits Jun 9, 2020
Reviewed-by: darcy, mikael
Reviewed-by: dcubed, stefank
Reviewed-by: herrick, asemenyuk
Reviewed-by: herrick, almatvee
…ctionaryShared' has not been declared)

Reviewed-by: dholmes
… and/or OBSOLETE method(s) found

Remove optimizations from class redefinition that cause the guarantee hit

Reviewed-by: coleenp, dcubed
…ould not be installing old methods

Fix the method->is_old() assert

Reviewed-by: dlong, chagedorn
…:load_shared_class()

SystemDitionary::load_shared_class can avoid calling is_shared_class_visible if dumptime and runtime do not use modulepath and boot classpath appending.

Reviewed-by: iklam, ccheung
…ass found as resource in unnamed module

Reviewed-by: mchung
…read when using handshakes

Reviewed-by: dholmes, dcubed, sspitsyn, ysuenaga
…ponsing logic seems to be broken

Fix check isJFR_active()

Reviewed-by: sspitsyn, lmesnik
…rvices/virtualMemoryTracker.cpp:388 Error: ShouldNotReachHere()

Reviewed-by: minqi, dholmes
Reviewed-by: psandoz, martin, bchristi, rriggs, smarks
…undle root)

Reviewed-by: herrick, almatvee
…s with --illegal-access=deny

Add modules to test/hotspot/jtreg/compiler/intrinsics/Test8237524

Reviewed-by: iignatyev
Perform base archive header CRC check earlier.

Reviewed-by: iklam, coleenp
Prasadrao Koppula and others added 10 commits Jun 11, 2020
8245585: Add SourceVersion.RELEASE_16
8245586: Add source 16 and target 16 to javac
8245544: com/sun/tools/javac/platform/JDKPlatformProvider.java does not support ct.sym with platform versions 16+

Co-authored-by: David Holmes <david.holmes@oracle.com>
Co-authored-by: Jan Lahoda <jan.lahoda@oracle.com>
Reviewed-by: erikj, dholmes, ihse, neugens, jjg, jlahoda, jlaskey, mikael
…/suspend/suspend001/TestDescription.java

Reviewed-by: dholmes
Added tag jdk-16+1 for changeset 4a485c89d5a0

# Conflicts:
#	src/hotspot/share/classfile/classFileParser.cpp
#	src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
#	test/hotspot/jtreg/runtime/cds/appcds/ArchiveRelocationTest.java
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jun 17, 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 Jun 17, 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
  • 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:

  • dc585c2: 8247746: [lworld] TestNullableArray::test78 fails with ZGC due to incorrect result

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

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

@MrSimms
Copy link
Member Author

@MrSimms MrSimms commented Jun 17, 2020

/integrate

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

@openjdk openjdk bot commented Jun 17, 2020

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

  • dc585c2: 8247746: [lworld] TestNullableArray::test78 fails with ZGC due to incorrect result

Your commit was automatically rebased without conflicts.

Pushed as commit fdfc4b3.

@openjdk openjdk bot removed the rfr label Jun 17, 2020
@MrSimms MrSimms deleted the lworld_merge_jdk_16_1 branch Jun 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment