From 3918f9f523521e77bd3820be28d79a4c1d02903c Mon Sep 17 00:00:00 2001 From: Jorn Vernee Date: Thu, 12 Jan 2023 06:49:27 +0000 Subject: [PATCH 1/4] 8299090: Specify coordinate order for additional CaptureCallState parameters on class as well Reviewed-by: pminborg, mcimadamore --- src/java.base/share/classes/java/lang/foreign/Linker.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/java.base/share/classes/java/lang/foreign/Linker.java b/src/java.base/share/classes/java/lang/foreign/Linker.java index e3af69954a8..12ba7f6ce5f 100644 --- a/src/java.base/share/classes/java/lang/foreign/Linker.java +++ b/src/java.base/share/classes/java/lang/foreign/Linker.java @@ -303,8 +303,8 @@ public sealed interface Linker permits AbstractLinker { * before it can be overwritten by the Java runtime, or read through conventional means} *

* A downcall method handle linked with this option will feature an additional {@link MemorySegment} - * parameter directly following the target address parameter. This memory segment must be a - * native segment into which the captured state is written. + * parameter directly following the target address, and optional {@link SegmentAllocator} parameters. + * This memory segment must be a native segment into which the captured state is written. * * @param capturedState the names of the values to save. * @see CaptureCallState#supported() @@ -323,6 +323,10 @@ public sealed interface Linker permits AbstractLinker { *

* Execution state is captured by a downcall method handle on invocation, by writing it * to a native segment provided by the user to the downcall method handle. + * For this purpose, a downcall method handle linked with the {@link #captureCallState(String[])} + * option will feature an additional {@link MemorySegment} parameter directly + * following the target address, and optional {@link SegmentAllocator} parameters. + * This parameter represents the native segment into which the captured state is written. *

* The native segment should have the layout {@linkplain CaptureCallState#layout associated} * with the particular {@code CaptureCallState} instance used to link the downcall handle. From 752a37016f49ef8f2405dd74f96f58f80d606cd3 Mon Sep 17 00:00:00 2001 From: Christoph Langer Date: Thu, 12 Jan 2023 08:02:58 +0000 Subject: [PATCH 2/4] 8299439: java/text/Format/NumberFormat/CurrencyFormat.java fails for hr_HR Reviewed-by: naoto Backport-of: 3b374c0153950ab193f3a188b57d3404b4ce2fe2 --- .../sun/util/resources/ext/CurrencyNames_hr_HR.properties | 3 ++- test/jdk/ProblemList.txt | 4 +--- .../text/Format/NumberFormat/CurrencySymbols.properties | 6 +++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties index 70f210e2da6..56e61953a8c 100644 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties +++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -35,4 +35,5 @@ # This notice and attribution to Taligent may not be removed. # Taligent is a registered trademark of Taligent, Inc. +EUR=\u20AC HRK=Kn diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt index 045293de503..1f09afe7940 100644 --- a/test/jdk/ProblemList.txt +++ b/test/jdk/ProblemList.txt @@ -1,6 +1,6 @@ ########################################################################### # -# Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 2023, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -682,8 +682,6 @@ sanity/client/SwingSet/src/ButtonDemoScreenshotTest.java 8265770 macosx-all # jdk_text -java/text/Format/NumberFormat/CurrencyFormat.java 8299439 generic-all - ############################################################################ # jdk_time diff --git a/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties b/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties index cf73a9c7e31..665dd3b290a 100644 --- a/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties +++ b/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties @@ -79,7 +79,7 @@ fr_FR=\u20AC fr_LU=\u20AC hi_IN=\u0930\u0942 hr=\u00A4 -hr_HR=Kn +hr_HR=\u20AC hu=\u00A4 hu_HU=Ft is=\u00A4 @@ -94,9 +94,9 @@ ja_JP=\uFFE5 ko=\u00A4 ko_KR=\uFFE6 lt=\u00A4 -lt_LT=Lt;2014-12-31-22-00-00;\u20AC +lt_LT=\u20AC lv=\u00A4 -lv_LV=Ls;2013-12-31-22-00-00;\u20AC +lv_LV=\u20AC mk=\u00A4 mk_MK=Den nl=\u00A4 From 6a4a8743562bd8f937542cdeb6557b3fe60e9a23 Mon Sep 17 00:00:00 2001 From: Roger Riggs Date: Thu, 12 Jan 2023 14:54:39 +0000 Subject: [PATCH 3/4] 8299034: Runtime::exec clarification of inherited environment Reviewed-by: alanb --- src/java.base/share/classes/java/lang/ProcessBuilder.java | 4 ++++ src/java.base/share/classes/java/lang/Runtime.java | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/java.base/share/classes/java/lang/ProcessBuilder.java b/src/java.base/share/classes/java/lang/ProcessBuilder.java index c2b3570d1cc..a7076ca4584 100644 --- a/src/java.base/share/classes/java/lang/ProcessBuilder.java +++ b/src/java.base/share/classes/java/lang/ProcessBuilder.java @@ -1004,6 +1004,8 @@ public final class ProcessBuilder * be required to start a process on some operating systems. * As a result, the subprocess may inherit additional environment variable * settings beyond those in the process builder's {@link #environment()}. + * The minimal set of system dependent environment variables + * may override the values provided in the environment. * *

If there is a security manager, its * {@link SecurityManager#checkExec checkExec} @@ -1181,6 +1183,8 @@ public final class ProcessBuilder * be required to start a process on some operating systems. * As a result, the subprocess may inherit additional environment variable * settings beyond those in the process builder's {@link #environment()}. + * The minimal set of system dependent environment variables + * may override the values provided in the environment. *

* If there is a security manager, its * {@link SecurityManager#checkExec checkExec} diff --git a/src/java.base/share/classes/java/lang/Runtime.java b/src/java.base/share/classes/java/lang/Runtime.java index ffef8160c25..25d2351a24e 100644 --- a/src/java.base/share/classes/java/lang/Runtime.java +++ b/src/java.base/share/classes/java/lang/Runtime.java @@ -569,6 +569,8 @@ public class Runtime { * be required to start a process on some operating systems. * As a result, the subprocess may inherit additional environment variable * settings beyond those in the specified environment. + * The minimal set of system dependent environment variables + * may override the values provided in the environment. * *

{@link ProcessBuilder#start()} is now the preferred way to * start a process with a modified environment. From 4b92fb0c6bc82e37e5fb20c72c3ff701070be6dd Mon Sep 17 00:00:00 2001 From: Mikael Vidstedt Date: Thu, 12 Jan 2023 18:47:08 +0000 Subject: [PATCH 4/4] 8299918: Update Xcode11.3.1-MacOSX10.15 devkit at Oracle Reviewed-by: erikj Backport-of: a17b563f54b2e0953a1dd9a613e6d5e0e9a8e4cb --- make/conf/jib-profiles.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js index 51f840a826a..9c4aa272534 100644 --- a/make/conf/jib-profiles.js +++ b/make/conf/jib-profiles.js @@ -990,7 +990,7 @@ var getJibProfilesProfiles = function (input, common, data) { dependencies: [ "lldb" ], environment_path: [ input.get("gnumake", "install_path") + "/bin", - input.get("lldb", "install_path") + "/Xcode.app/Contents/Developer/usr/bin", + input.get("lldb", "install_path") + "/Xcode/Contents/Developer/usr/bin", ], }; profiles["run-test"] = concatObjects(profiles["run-test"], macosxRunTestExtra); @@ -1126,7 +1126,7 @@ var getJibProfilesDependencies = function (input, common) { organization: common.organization, ext: "tar.gz", module: "devkit-macosx" + (input.build_cpu == "x64" ? "_x64" : ""), - revision: (input.build_cpu == "x64" ? "Xcode11.3.1-MacOSX10.15+1.1" : devkit_platform_revisions[devkit_platform]) + revision: (input.build_cpu == "x64" ? "Xcode11.3.1-MacOSX10.15+1.2" : devkit_platform_revisions[devkit_platform]) }, cups: {