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-23+37 #156

Open
wants to merge 3,936 commits into
base: crac
Choose a base branch
from
Open

Merge jdk-23+37 #156

wants to merge 3,936 commits into from

Conversation

rvansa
Copy link
Collaborator

@rvansa rvansa commented Aug 29, 2024

This merges the release candidate tag 23+37 into CRaC, expecting that we will baseline on 23 soon.

Most of the conflicts to resolve were trivial, one place worth attention is LinuxAttachListener+LinuxAttachOperation that were refactored in CRaC and in upstream renamed to PosixAttachListener+PosixAttachOperation. Second set of conflicts appeared in CPU features handling.


Progress

  • Change must not contain extraneous whitespace

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 156

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/crac/pull/156.diff

Webrev

Link to Webrev Comment

lmesnik and others added 30 commits May 29, 2024 15:01
…va thread info for JNI Local Ref

Reviewed-by: kevinw, dholmes
8312111: open/test/jdk/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java fails on ubuntu 23.04

Reviewed-by: prr
…_inMemoryCompilation_keep_cl failed with Full gc happened. Test was useless.

Reviewed-by: tschatzl, ayang
Reviewed-by: aph, jpai, mcimadamore
…erated cycle

Reviewed-by: kdnilsen, shade, ysr
…ould pass current thread explicitly

Reviewed-by: sspitsyn, cjplummer
… finalization

Reviewed-by: cjplummer, sspitsyn
…nent

8331680: NumberFormat is missing some bad exponent strict parse cases

Reviewed-by: naoto
Reviewed-by: amenkov, alanb
…g packaging tools in the system

Reviewed-by: almatvee
chhagedorn and others added 19 commits July 17, 2024 05:41
Co-authored-by: Roland Westrelin <roland@openjdk.org>
Reviewed-by: ahgross, rhalade, thartmann, epeter, mbalao, fferrari
Reviewed-by: jdv, psadhukhan, aivanov, rhalade
Reviewed-by: prr, rhalade, psadhukhan
Reviewed-by: djelinski, dholmes
… Unexpected message

Reviewed-by: jpai
Backport-of: c798316
…aceIdEpoch::this_epoch_method_and_class_bits()))) != 0))) failed: invariant

Reviewed-by: egahlin
Backport-of: 67979eb
Reviewed-by: jvernee
Backport-of: b9b0b85
Reviewed-by: mcimadamore
Backport-of: 2b0adfc
…Time.java fails on alinux3

Reviewed-by: alanb
Backport-of: 7baddc2
Reviewed-by: jlu, prappo, naoto, vromero
…ent with their setVerbose methods

Reviewed-by: kevinw
Backport-of: 9775d57
Added tag jdk-23+37 for changeset 9ad2e63
@bridgekeeper
Copy link

bridgekeeper bot commented Aug 29, 2024

👋 Welcome back rvansa! A progress list of the required criteria for merging this PR into crac 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 Aug 29, 2024

@rvansa 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-23+37

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

@openjdk openjdk bot added the clean label Aug 29, 2024
@rvansa
Copy link
Collaborator Author

rvansa commented Aug 30, 2024

Some of the test failures (on x86_64 and macos) are intermittent failures, should be fixed independently.
There are failures on x86 (32bit), I could reproduce some container related tests - there were some 32-bit libraries missing in the system (though the failure does not reproduce all the time).
Also TestStackOverflowDuringInit has some fixes in the downstream; these will be applied as a follow-up.

@rvansa rvansa changed the title Merge OpenJDK 23 into CRaC Merge jdk-23+37 Aug 30, 2024
@openjdk openjdk bot added ready Pull request is ready to be integrated rfr Pull request is ready for review labels Aug 30, 2024
@mlbridge
Copy link

mlbridge bot commented Aug 30, 2024

Webrevs

@mlbridge
Copy link

mlbridge bot commented Sep 12, 2024

Mailing list message from Anton Kozlov on crac-dev:

On 8/30/24 2:26 PM, Radim Vansa wrote:

The PR is too big for github to visualize it. I'm reviewing the difference with jdk-23+37:

diff --git a/make/autoconf/Makefile.template b/make/autoconf/Makefile.template
index 4cb5057c05c..a1baff3395c 100644
--- a/make/autoconf/Makefile.template
+++ b/make/autoconf/Makefile.template
@@ -21,7 +21,16 @@
# questions.
#

-# This Makefile was generated by configure @DATE_WHEN_CONFIGURED@
-# GENERATED FILE, DO NOT EDIT
-SPEC:=@OUTPUTDIR@/spec.gmk
-include @WORKSPACE_ROOT@/Makefile
+AsyncGetCallTrace
+jio_fprintf
+jio_printf
+jio_snprintf
+jio_vfprintf
+jio_vsnprintf
+JNI_CreateJavaVM
+JNI_GetCreatedJavaVMs
+JNI_GetDefaultJavaVMInitArgs
+JVM_IsForeignLinkerSupported
+JVM_FindClassFromBootLoader
+JVM_InitAgentProperties
+JVM_Checkpoint

This seems to be mis-merge.

---

commit 20975f6
Author: Radim Vansa <rvansa at azul.com>
Date: Thu Aug 29 17:36:57 2024 +0200

Build jdk/test/lib/containers/docker for tests

diff --git a/make/test/BuildTestLib.gmk b/make/test/BuildTestLib.gmk
index d48f263f6f9..2298fc734c5 100644
--- a/make/test/BuildTestLib.gmk
+++ b/make/test/BuildTestLib.gmk
@@ -60,7 +60,7 @@ TARGETS += $(BUILD_WB_JAR)
$(eval $(call SetupJavaCompilation, BUILD_TEST_LIB_JAR, \
TARGET_RELEASE := $(TARGET_RELEASE_NEWJDK_UPGRADED), \
SRC := $(TEST_LIB_SOURCE_DIR), \
- EXCLUDES := jdk/test/lib/containers jdk/test/lib/security, \
+ EXCLUDES := jdk/test/lib/containers/cgroup jdk/test/lib/security, \
BIN := $(TEST_LIB_SUPPORT)/test-lib_classes, \
HEADERS := $(TEST_LIB_SUPPORT)/test-lib_headers, \
JAR := $(TEST_LIB_SUPPORT)/test-lib.jar, \
diff --git a/test/lib/jdk/test/lib/containers/docker/DockerRunOptions.java b/test/lib/jdk/test/lib/containers/docker/DockerRunOptions.java
index fc3b793c47a..3f1e4c3b69b 100644
--- a/test/lib/jdk/test/lib/containers/docker/DockerRunOptions.java
+++ b/test/lib/jdk/test/lib/containers/docker/DockerRunOptions.java
@@ -59,10 +59,10 @@ public DockerRunOptions(String imageNameAndTag, String javaCmd,
this.imageNameAndTag = imageNameAndTag;
this.command = javaCmd;
this.classToRun = classToRun;
- this.addJavaOpts(javaOpts);
+ Collections.addAll(this.javaOpts, javaOpts);
// always print hserr to stderr in the docker tests to avoid
// trouble accessing it after a crash in the container
- this.addJavaOpts("-XX:+ErrorFileToStderr");
+ Collections.addAll(this.javaOpts, "-XX:+ErrorFileToStderr");
}

public DockerRunOptions addDockerOpts(String... opts) {

The reason for this change is not clear, it seems to be this PR specific, but it is not CRaC-specific. Better to be done as a follow-up change.

In the rest, LGTM. Thank you!

-- Anton

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
clean ready Pull request is ready to be integrated rfr Pull request is ready for review
Development

Successfully merging this pull request may close these issues.