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

Closed

Conversation

vicente-romero-oracle
Copy link
Contributor

@vicente-romero-oracle vicente-romero-oracle commented Jan 13, 2025

Merge branch 'lworld' into lw5_merge_lworld

Conflicts:

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


Progress

  • Change must not contain extraneous whitespace

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/valhalla.git pull/1329/head:pull/1329
$ git checkout pull/1329

Update a local copy of the PR:
$ git checkout pull/1329
$ git pull https://git.openjdk.org/valhalla.git pull/1329/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1329

View PR using the GUI difftool:
$ git pr show -t 1329

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/valhalla/pull/1329.diff

Sorry, something went wrong.

shipilev and others added 30 commits October 22, 2024 07:07
…s tmp file in src dir

Reviewed-by: dfuchs, amenkov
…a from src to test directory

Reviewed-by: thartmann, shade, jwaters
Reviewed-by: liach, vromero
…locations in regions

Reviewed-by: tschatzl, sjohanss
Reviewed-by: aboldtch, mli, jsikstro, eosterlund
…s set on HttpClient

Reviewed-by: dfuchs, jpai, djelinski
…eflection

Reviewed-by: liach, dholmes, jrose, alanb, mli
…where the test tables are not visible

Reviewed-by: abhiscxk, asemenov
…ring IGVN due to unhandled top

Reviewed-by: roland, thartmann
…and OpaqueNotNullNode

Reviewed-by: kvn, roland
rwestrel and others added 18 commits November 6, 2024 14:49
…and switch (Second Preview)

Reviewed-by: vromero, jlahoda
Reviewed-by: egahlin, rkennke, mgronlun, wkemper
… Support

Reviewed-by: jbhateja, sviswanathan
…s/InlineOops.java with ZGC in interpreted mode
…slow_path(zaddress)+0x4c

Co-authored-by: Erik Österlund <eosterlund@openjdk.org>
Reviewed-by: eosterlund
Merge jdk-24+22
Merge jdk-24+23
# Conflicts:
#	src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
@vicente-romero-oracle
Copy link
Contributor Author

/integrate

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 13, 2025

👋 Welcome back vromero! A progress list of the required criteria for merging this PR into lw5 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 bot commented Jan 13, 2025

@vicente-romero-oracle 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

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 lw5 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 lw5 branch, type /integrate in a new comment.

@openjdk
Copy link

openjdk bot commented Jan 13, 2025

Going to push as commit c3a73cf.

@openjdk openjdk bot added the integrated label Jan 13, 2025
@openjdk openjdk bot closed this Jan 13, 2025
@openjdk
Copy link

openjdk bot commented Jan 13, 2025

@vicente-romero-oracle Pushed as commit c3a73cf.

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

@vicente-romero-oracle vicente-romero-oracle deleted the lw5_merge_lworld branch January 13, 2025 19:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

None yet