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 lworld #255

Conversation

@MrSimms
Copy link
Member

@MrSimms MrSimms commented Nov 9, 2020

Merge tag 'jdk-16+23'

Merge branch 'lworld' into type-restrictions_merge_lworld_16_23

Conflicts:

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


Progress

  • Change must not contain extraneous whitespace

Testing

Linux x64 Windows x64 macOS x64
Build ✔️ (4/4 passed) ✔️ (2/2 passed) ✔️ (2/2 passed)
Test (tier1) (2/9 running) (9/9 running) (2/9 running)

Download

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

naotoj and others added 30 commits Oct 28, 2020
… for code-gen

Reviewed-by: kvn, vlivanov, azeemj
…d-safe manner

Reviewed-by: chegar, ryadav, dfuchs
Reviewed-by: shade, ayang, kbarrett
…ore thread right after VM call on x86_32

Reviewed-by: dholmes, shade
…ocessing

Co-authored-by: Richard Reingruber <rrich@openjdk.org>
Reviewed-by: rrich, sspitsyn
Reviewed-by: ayang, kbarrett
…evel

add more method-level options  for -XX:CompileCommand
eg. -XX:CompileCommand=option,java.lang.String::startsWith,BreakAtCompile directs JIT compilers to hit BREAKPOINT when they compile the method java.lang.String::startsWith.

Reviewed-by: neliasso, azeemj, phh
…va.net.BindException: Cannot assign requested address: connect

Reviewed-by: dfuchs, michaelm
Remove improper wait argument.

Reviewed-by: sjohanss, tschatzl, ayang
Reviewed-by: sjohanss, kbarrett
Kim Barrett and others added 16 commits Nov 4, 2020
Reviewed-by: mchung, pliden, rriggs, dholmes, ihse, smarks, alanb
Reviewed-by: shade, alanb, chegar
…ue fits in 32 bits on x86_64

Reviewed-by: azeemj, kvn, redestad, thartmann
Reviewed-by: coleenp, shade, ihse
Reviewed-by: kcr, erikj, almatvee, asemenyuk, prr, ihse
Merge tag 'jdk-16+23'
# Conflicts:
#	src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Nov 9, 2020

👋 Welcome back dsimms! A progress list of the required criteria for merging this PR into type-restrictions will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@MrSimms
Copy link
Member Author

@MrSimms MrSimms commented Nov 9, 2020

/summary Merge tag 'jdk-16+23'

@openjdk
Copy link

@openjdk openjdk bot commented Nov 9, 2020

@MrSimms This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

Merge lworld

Merge tag 'jdk-16+23'

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the type-restrictions branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the type-restrictions branch, type /integrate in a new comment.

@openjdk
Copy link

@openjdk openjdk bot commented Nov 9, 2020

@MrSimms Setting summary to Merge tag 'jdk-16+23'

@mlbridge
Copy link

@mlbridge mlbridge bot commented Nov 9, 2020

@MrSimms
Copy link
Member Author

@MrSimms MrSimms commented Nov 9, 2020

/integrate

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

@openjdk openjdk bot commented Nov 9, 2020

@MrSimms Pushed as commit 92f115a.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@MrSimms MrSimms deleted the type-restrictions_merge_lworld_16_23 branch Nov 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment