Merge

2025-08-27 06:45:07 +02:00 · 2017-10-10 16:29:04 +02:00 · 2017-10-10 16:29:04 +02:00 · 42a29333b9
commit 42a29333b9
parent 9f2615c4de f8b593cb66
301 changed files with 9627 additions and 3168 deletions
--- a/src/java.base/share/classes/java/lang/Math.java
+++ b/src/java.base/share/classes/java/lang/Math.java
@ -1094,6 +1094,7 @@ public final class Math {
     * @return the result
     * @since 9
     */
+    @HotSpotIntrinsicCandidate
    public static long multiplyHigh(long x, long y) {
        if (x < 0 || y < 0) {
            // Use technique from section 8-2 of Henry S. Warren, Jr.,
--- a/src/java.base/share/classes/jdk/internal/vm/cds/resources/ModuleLoaderMap.dat
+++ b/src/java.base/share/classes/jdk/internal/vm/cds/resources/ModuleLoaderMap.dat
@ -1,4 +0,0 @@
-BOOT
-@@BOOT_MODULE_NAMES@@
-PLATFORM
-@@PLATFORM_MODULE_NAMES@@