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

[GR-58528] Update labsjdk to 24+17-jvmci-b01 #9775

Merged
merged 39 commits into from
Sep 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
04029a4
Automatic merge of master into galahad
OracleLabsAutomation Sep 19, 2024
b3d42ce
Automatic merge of master into galahad
OracleLabsAutomation Sep 19, 2024
69bf03a
Automatic merge of master into galahad
OracleLabsAutomation Sep 19, 2024
2ec2300
Automatic merge of master into galahad
OracleLabsAutomation Sep 20, 2024
5921888
Automatic merge of master into galahad
OracleLabsAutomation Sep 20, 2024
fd87ac2
Automatic merge of master into galahad
OracleLabsAutomation Sep 20, 2024
89134a7
Automatic merge of master into galahad
OracleLabsAutomation Sep 20, 2024
44d6af6
Automatic merge of master into galahad
OracleLabsAutomation Sep 21, 2024
dea6871
Automatic merge of master into galahad
OracleLabsAutomation Sep 23, 2024
063526e
Automatic merge of master into galahad
OracleLabsAutomation Sep 23, 2024
17704ca
Automatic merge of master into galahad
OracleLabsAutomation Sep 24, 2024
bec6fa0
Automatic merge of master into galahad
OracleLabsAutomation Sep 24, 2024
175c9ad
Automatic merge of master into galahad
OracleLabsAutomation Sep 24, 2024
256bf5d
Automatic merge of master into galahad
OracleLabsAutomation Sep 24, 2024
3a42069
Automatic merge of master into galahad
OracleLabsAutomation Sep 24, 2024
e546788
Automatic merge of master into galahad
OracleLabsAutomation Sep 24, 2024
765fa65
Automatic merge of master into galahad
OracleLabsAutomation Sep 24, 2024
6c1d592
Automatic merge of master into galahad
OracleLabsAutomation Sep 25, 2024
0295db9
Automatic merge of master into galahad
OracleLabsAutomation Sep 25, 2024
5e0418d
Automatic merge of master into galahad
OracleLabsAutomation Sep 25, 2024
9f4c112
Automatic merge of master into galahad
OracleLabsAutomation Sep 25, 2024
bb2601a
Automatic merge of master into galahad
OracleLabsAutomation Sep 25, 2024
ebf3076
Automatic merge of master into galahad
OracleLabsAutomation Sep 25, 2024
5bd7fc7
Automatic merge of master into galahad
OracleLabsAutomation Sep 25, 2024
90b7a72
Automatic merge of master into galahad
OracleLabsAutomation Sep 25, 2024
b489932
Automatic merge of master into galahad
OracleLabsAutomation Sep 25, 2024
1dff045
Automatic merge of master into galahad
OracleLabsAutomation Sep 26, 2024
e1c2a1d
Automatic merge of master into galahad
OracleLabsAutomation Sep 26, 2024
36e784d
Automatic merge of master into galahad
OracleLabsAutomation Sep 26, 2024
a98592f
Automatic merge of master into galahad
OracleLabsAutomation Sep 26, 2024
2d1c04d
Automatic merge of master into galahad
OracleLabsAutomation Sep 26, 2024
95cd186
update JVMCI to 24+17-jvmci-b01
OracleLabsAutomation Sep 26, 2024
b801d1c
Merge tag 'jdk-24+17'
zapster Sep 27, 2024
cd94784
svm: update @BasedOnJDKFile annotations for LibCHelper
zapster Sep 27, 2024
964658b
svm: review libcontainer changes in JDK 24+17
zapster Sep 27, 2024
28e5d00
compiler: update JVMCIVersionCheck
zapster Sep 27, 2024
44209be
compiler: add Math.tanh to UnimplementedGraalIntrinsics (JDK-8338694)
zapster Sep 27, 2024
903330b
deploy snapshots
marwan-hallaoui Sep 27, 2024
fc5b974
svm: work around "JDK-8340831: Simplify simple validation for class d…
zapster Sep 27, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions common.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@

"oraclejdk23": {"name": "jpg-jdk", "version": "23", "build_id": "jdk-23+37", "platformspecific": true, "extrabundles": ["static-libs"]},

"oraclejdk-latest": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+16", "platformspecific": true, "extrabundles": ["static-libs"]},
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-24+16-jvmci-b01", "platformspecific": true },
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-24+16-jvmci-b01-debug", "platformspecific": true },
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-24+16-jvmci-b01-sulong", "platformspecific": true },
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-24+16-jvmci-b01", "platformspecific": true },
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-24+16-jvmci-b01-debug", "platformspecific": true },
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-24+16-jvmci-b01-sulong", "platformspecific": true }
"oraclejdk-latest": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+17", "platformspecific": true, "extrabundles": ["static-libs"]},
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-24+17-jvmci-b01", "platformspecific": true },
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-24+17-jvmci-b01-debug", "platformspecific": true },
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-24+17-jvmci-b01-sulong", "platformspecific": true },
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-24+17-jvmci-b01", "platformspecific": true },
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-24+17-jvmci-b01-debug", "platformspecific": true },
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-24+17-jvmci-b01-sulong", "platformspecific": true }
},

"eclipse": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ public final class JVMCIVersionCheck {
private static final Map<String, Map<String, Version>> JVMCI_MIN_VERSIONS = Map.of(
"21", Map.of(DEFAULT_VENDOR_ENTRY, createLegacyVersion(23, 1, 33)),
"24", Map.of(
"Oracle Corporation", createLabsJDKVersion("24+16", 1),
DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("24+16", 1)));
"Oracle Corporation", createLabsJDKVersion("24+17", 1),
DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("24+17", 1)));
private static final int NA = 0;
/**
* Minimum Java release supported by Graal.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@ public UnimplementedGraalIntrinsics(Architecture arch) {
// beneficial.
"java/lang/Math.max(II)I",
"java/lang/Math.min(II)I",
// Newly added by JDK-8338694
"java/lang/Math.tanh(D)D",
// see Math.min/max
"java/lang/StrictMath.max(II)I",
"java/lang/StrictMath.min(II)I",
// handled through an intrinsic for String.equals itself
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1739,7 +1739,7 @@ private static boolean allocateInstance(JNIEnvironment jni, JNIObjectHandle thre
};

private static final BreakpointSpecification[] CLASS_PREDEFINITION_BREAKPOINT_SPECIFICATIONS = {
brk("java/lang/invoke/MethodHandles$Lookup$ClassFile", "<init>", "(Ljava/lang/String;I[B)V", BreakpointInterceptor::onMethodHandleClassFileInit),
optionalBrk("java/lang/invoke/MethodHandles$Lookup$ClassFile", "<init>", "(Ljava/lang/String;I[B)V", BreakpointInterceptor::onMethodHandleClassFileInit),
};

private static BreakpointSpecification brk(String className, String methodName, String signature, BreakpointHandler handler) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ public class LibCHelper {
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+13/src/java.base/windows/native/libjava/locale_str.h")
public static class Locale {
@CFunction(transition = Transition.TO_NATIVE)
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/java.base/unix/native/libjava/java_props_md.c#L93-L540")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+13/src/java.base/windows/native/libjava/java_props_md.c#L257-L713")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+17/src/java.base/unix/native/libjava/java_props_md.c#L93-L357")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+17/src/java.base/windows/native/libjava/java_props_md.c#L321-L715")
public static native CCharPointerPointer parseDisplayLocale();

@CFunction(transition = Transition.TO_NATIVE)
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/java.base/unix/native/libjava/java_props_md.c#L93-L540")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+13/src/java.base/windows/native/libjava/java_props_md.c#L257-L713")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+17/src/java.base/unix/native/libjava/java_props_md.c#L93-L357")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+17/src/java.base/windows/native/libjava/java_props_md.c#L321-L715")
public static native CCharPointerPointer parseFormatLocale();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/share/memory/allocation.inline.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/share/memory/allStatic.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/share/nmt/memTag.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/share/runtime/os.cpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+17/src/hotspot/share/runtime/os.cpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/share/runtime/os.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/share/runtime/os.inline.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/share/utilities/checkedCast.hpp")
Expand Down