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 pattern-runtime #35

Merged
merged 153 commits into from
Jun 19, 2020
Merged

Conversation

openjdk-bot
Copy link

@openjdk-bot openjdk-bot commented Jun 11, 2020

Hi all,

this is an automatically generated pull request to notify you that there are 153 commits from the branch pattern-runtimethat can not be merged into the branch patterns:

The following file contains merge conflicts:

  • src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java

All Committers in this project have access to my personal fork and can therefore help resolve these merge conflicts (you may want to coordinate who should do this).
The following paragraphs will give an example on how to solve these merge conflicts and push the resulting merge commit to this pull request.
The below commands should be run in a local clone of your personal fork of the openjdk/amber repository.

# Ensure target branch is up to date
$ git checkout patterns
$ git pull https://github.com/openjdk/amber patterns

# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/amber +57:openjdk-bot-57
$ git checkout openjdk-bot-57

# Merge the target branch
$ git merge patterns

When you have resolved the conflicts resulting from the git merge command above, run the following commands to create a merge commit:

$ git add paths/to/files/with/conflicts
$ git commit -m 'Merge pattern-runtime'

When you have created the merge commit, run the following command to push the merge commit to this pull request:

$ git push https://github.com/openjdk-bot/amber openjdk-bot-57:57

Note: if you are using SSH to push commits to GitHub, then change the URL in the above git push command accordingly.

Thanks,
J. Duke


Progress

  • Change must not contain extraneous whitespace

Download

$ git fetch https://git.openjdk.java.net/amber pull/35/head:pull/35
$ git checkout pull/35

Sorry, something went wrong.

Pankaj Bansal and others added 30 commits June 1, 2020 23:06
…rgetF10.html fails

Reviewed-by: psadhukhan
Add G1OldGenAllocationTracker

Reviewed-by: tschatzl, phh
…nal operation

Changed Cipher[In/Out]putStream to allocate a buffer and reuse it

Reviewed-by: weijun
…d superclass with no permits clause

Reviewed-by: mcimadamore
…a list of classes has not changed

Refactor the redefine check of an array attribute

Reviewed-by: hseigel, coleenp
…ncurrent weak roots phase

Reviewed-by: shade
…ant errors paths

Reviewed-by: pliden, eosterlund
… not make compiled methods on stack not_entrant

Reviewed-by: mdoerr, kvn, sspitsyn
…cket option

This patch removes ExtendedSocketOptions.SO_FLOW_SLA, SocketFlow and SocketFlow.Status which were terminally deprecated in JDK 14 in preparation for the removal of the Solaris port.

Reviewed-by: alanb, dfuchs, chegar, vtewari
…or failed mmap call

Reviewed-by: sjohanss, stefank
Reviewed-by: kvn
Free _local_interfaces when we free _transitive_interfaces since they can share memory.

Reviewed-by: fparain, lfoltan, iklam
…ntally tagged artifacts

Reviewed-by: egahlin
Reviewed-by: stefank, tschatzl, sjohanss
Use vm_global() OopStorage for system dictionary roots

Reviewed-by: eosterlund, lfoltan
Reviewed-by: hannesw
…a:bootClasses

Reviewed-by: lmesnik, vlivanov
…ctedException

Fix for intermitant failure with AsynchronousSocketChannelNAPITest that sometimes fails with a NotYetConnectedException while trying to read data after connecting

Reviewed-by: alanb, dfuchs
JesperIRL and others added 24 commits June 11, 2020 04:07
… 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
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
@bridgekeeper
Copy link

bridgekeeper bot commented Jun 11, 2020

👋 Welcome back duke! A progress list of the required criteria for merging this PR into patterns will be added to the body of your pull request.

@openjdk openjdk bot added merge-conflict The pull request has a merge conflict with the target branch rfr Ready for review labels Jun 11, 2020
@mlbridge
Copy link

mlbridge bot commented Jun 11, 2020

Webrevs

@vicente-romero-oracle vicente-romero-oracle merged commit 1512901 into openjdk:patterns Jun 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
failed-auto-merge merge-conflict The pull request has a merge conflict with the target branch rfr Ready for review
Development

Successfully merging this pull request may close these issues.

None yet