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

Closed
wants to merge 94 commits into from
Closed

Merge jdk #257

wants to merge 94 commits into from

Conversation

MrSimms
Copy link
Member

@MrSimms MrSimms commented Nov 13, 2020

Merge tag 'jdk-16+24' into lworld_merge_jdk_16_24
Added tag jdk-16+24 for changeset bfa060f

Conflicts:

src/hotspot/share/classfile/classFileParser.cpp

src/hotspot/share/oops/fieldInfo.hpp

src/hotspot/share/oops/fieldStreams.hpp

src/hotspot/share/opto/arraycopynode.cpp

src/hotspot/share/opto/arraycopynode.hpp

src/hotspot/share/runtime/synchronizer.cpp


Progress

  • Change must not contain extraneous whitespace

Testing

Linux x64 Windows x64 macOS x64
Build (3/4 running) (2/2 running) (2/2 running)

Download

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

plummercj and others added 30 commits Nov 4, 2020
Reviewed-by: tschatzl, ayang
Reviewed-by: minqi, coleenp, thartmann
… oop

Reviewed-by: coleenp, dlong, rrich, sspitsyn
…luded in build

Reviewed-by: dholmes, iveresov
…ERRUPT after calling RawMonitorEnter

Reviewed-by: alanb, dholmes, sspitsyn
prsadhuk and others added 15 commits Nov 11, 2020
…entially

Prevent exponential number of calls to ConvI2LNode::Ideal() when AddIs are used
multiple times by other AddIs in the optimization ConvI2L(AddI(x, y)) ->
AddL(ConvI2L(x), ConvI2L(y)). This is achieved by (1) reusing existing ConvI2Ls
if possible rather than eagerly creating new ones and (2) postponing the
optimization of newly created ConvI2Ls. Remove hook node solution introduced in
8217359, since this is subsumed by (2). Use phase->is_IterGVN() rather than
can_reshape to check if ConvI2LNode::Ideal() is called within iterative GVN, for
clarity. Add regression tests that cover different shapes and sizes of AddI
subgraphs, implicitly checking (by not timing out) that there is no
combinatorial explosion.

Co-authored-by: Vladimir Ivanov <vlivanov@openjdk.org>
Reviewed-by: vlivanov, kvn
Co-authored-by: Erik Österlund <eosterlund@openjdk.org>
Reviewed-by: eosterlund, rehn, coleenp
Added tag jdk-16+24 for changeset bfa060f

# Conflicts:
#	src/hotspot/share/classfile/classFileParser.cpp
#	src/hotspot/share/oops/fieldInfo.hpp
#	src/hotspot/share/oops/fieldStreams.hpp
#	src/hotspot/share/opto/arraycopynode.cpp
#	src/hotspot/share/opto/arraycopynode.hpp
#	src/hotspot/share/runtime/synchronizer.cpp
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Nov 13, 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. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

@openjdk openjdk bot commented Nov 13, 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 jdk

Merge tag 'jdk-16+24'

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 1 new commit pushed to the lworld branch:

  • 1b1aefa: 8255046: [lworld] JIT should make use of array layout encoding in markWord

Please see this link for an up-to-date comparison between the source branch of this pull request and the lworld branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

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

/summary Merge tag 'jdk-16+24'

@openjdk
Copy link

@openjdk openjdk bot commented Nov 13, 2020

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

@mlbridge
Copy link

@mlbridge mlbridge bot commented Nov 13, 2020

@MrSimms
Copy link
Member Author

@MrSimms MrSimms commented Nov 13, 2020

/integrate

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

@openjdk openjdk bot commented Nov 13, 2020

@MrSimms Since your change was applied there has been 1 commit pushed to the lworld branch:

  • 1b1aefa: 8255046: [lworld] JIT should make use of array layout encoding in markWord

Your commit was automatically rebased without conflicts.

Pushed as commit 74e40a5.

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

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