Merge

Author: theaoqi

bin/jib.sh

@@ -130,7 +130,7 @@ install_jib() {
     fi
     # Want to check the filetype using file, to see if we got served a HTML error page.
     # This is sensitive to the filename containing a specific string, but good enough.
-    file ${installed_jib_script}.gz | grep "gzip compressed data" > /dev/null
+    file "${installed_jib_script}.gz" | grep "gzip compressed data" > /dev/null
     if [ $? -ne 0 ]; then 
         echo "Warning: ${installed_jib_script}.gz is not a gzip file."
         echo "If you are behind a proxy you may need to configure exceptions using no_proxy."

make/CompileDemos.gmk

@@ -171,41 +171,41 @@ $(BUILD_DEMO_CodePointIM_JAR): $(CODEPOINT_METAINF_SERVICE_FILE)
 
 $(eval $(call SetupBuildDemo, FileChooserDemo, \
     DEMO_SUBDIR := jfc, \
-    DISABLED_WARNINGS := rawtypes deprecation unchecked, \
+    DISABLED_WARNINGS := rawtypes deprecation unchecked this-escape, \
 ))
 
 $(eval $(call SetupBuildDemo, SwingSet2, \
     DEMO_SUBDIR := jfc, \
     EXTRA_COPY_TO_JAR := .java, \
     EXTRA_MANIFEST_ATTR := SplashScreen-Image: resources/images/splash.png, \
-    DISABLED_WARNINGS := rawtypes deprecation unchecked static serial cast, \
+    DISABLED_WARNINGS := rawtypes deprecation unchecked static serial cast this-escape, \
 ))
 
 $(eval $(call SetupBuildDemo, Font2DTest, \
-    DISABLED_WARNINGS := rawtypes deprecation unchecked serial cast, \
+    DISABLED_WARNINGS := rawtypes deprecation unchecked serial cast this-escape, \
     DEMO_SUBDIR := jfc, \
 ))
 
 $(eval $(call SetupBuildDemo, J2Ddemo, \
     DEMO_SUBDIR := jfc, \
     MAIN_CLASS := java2d.J2Ddemo, \
-    DISABLED_WARNINGS := rawtypes deprecation unchecked cast lossy-conversions, \
+    DISABLED_WARNINGS := rawtypes deprecation unchecked cast lossy-conversions this-escape, \
     JAR_NAME := J2Ddemo, \
 ))
 
 $(eval $(call SetupBuildDemo, Metalworks, \
-    DISABLED_WARNINGS := rawtypes unchecked, \
+    DISABLED_WARNINGS := rawtypes unchecked this-escape, \
     DEMO_SUBDIR := jfc, \
 ))
 
 $(eval $(call SetupBuildDemo, Notepad, \
-    DISABLED_WARNINGS := rawtypes, \
+    DISABLED_WARNINGS := rawtypes this-escape, \
     DEMO_SUBDIR := jfc, \
 ))
 
 $(eval $(call SetupBuildDemo, Stylepad, \
     DEMO_SUBDIR := jfc, \
-    DISABLED_WARNINGS := rawtypes unchecked, \
+    DISABLED_WARNINGS := rawtypes unchecked this-escape, \
     EXTRA_SRC_DIR := $(DEMO_SHARE_SRC)/jfc/Notepad, \
     EXCLUDE_FILES := $(DEMO_SHARE_SRC)/jfc/Notepad/README.txt, \
 ))
@@ -215,11 +215,12 @@ $(eval $(call SetupBuildDemo, SampleTree, \
 ))
 
 $(eval $(call SetupBuildDemo, TableExample, \
-    DISABLED_WARNINGS := rawtypes unchecked deprecation, \
+    DISABLED_WARNINGS := rawtypes unchecked deprecation this-escape, \
     DEMO_SUBDIR := jfc, \
 ))
 
 $(eval $(call SetupBuildDemo, TransparentRuler, \
+    DISABLED_WARNINGS := this-escape, \
     DEMO_SUBDIR := jfc, \
     MAIN_CLASS := transparentruler.Ruler, \
 ))

make/CompileModuleTools.gmk

@@ -53,7 +53,7 @@ $(eval $(call SetupJavaCompilation, BUILD_JIGSAW_TOOLS, \
                 build/tools/jigsaw, \
     COPY := .properties .html, \
     BIN := $(TOOLS_CLASSES_DIR), \
-    DISABLED_WARNINGS := fallthrough, \
+    DISABLED_WARNINGS := fallthrough this-escape, \
     JAVAC_FLAGS := \
         --add-modules jdk.jdeps \
         --add-exports java.base/jdk.internal.module=ALL-UNNAMED \

make/autoconf/basic.m4

@@ -477,7 +477,11 @@ AC_DEFUN([BASIC_CHECK_DIR_ON_LOCAL_DISK],
     # df on AIX does not understand -l. On modern AIXes it understands "-T local" which
     # is the same. On older AIXes we just continue to live with a "not local build" warning.
     if test "x$OPENJDK_TARGET_OS" = xaix; then
-      DF_LOCAL_ONLY_OPTION='-T local'
+      if "$DF -T local > /dev/null 2>&1"; then
+        DF_LOCAL_ONLY_OPTION='-T local'
+      else # AIX may use GNU-utils instead
+        DF_LOCAL_ONLY_OPTION='-l'
+      fi
     elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl1"; then
       # In WSL1, we can only build on a drvfs file system (that is, a mounted real Windows drive)
       DF_LOCAL_ONLY_OPTION='-t drvfs'

make/data/hotspot-symbols/symbols-unix

@@ -218,10 +218,8 @@ JVM_DefineModule
 JVM_SetBootLoaderUnnamedModule
 
 # Virtual thread notifications for JVMTI
-JVM_VirtualThreadMountBegin
-JVM_VirtualThreadMountEnd
-JVM_VirtualThreadUnmountBegin
-JVM_VirtualThreadUnmountEnd
+JVM_VirtualThreadMount
+JVM_VirtualThreadUnmount
 JVM_VirtualThreadHideFrames
 
 # Scoped values

make/jdk/src/classes/build/tools/generatecharacter/EmojiData.java

@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package build.tools.generatecharacter;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+import java.util.AbstractMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+/**
+ * A class holding emoji character properties
+ * https://unicode.org/reports/tr51/#Emoji_Properties_and_Data_Files
+ */
+class EmojiData {
+    // Emoji properties map
+    private final Map<Integer, Long> emojiProps;
+
+    static EmojiData readSpecFile(Path file, int plane) throws IOException {
+        return new EmojiData(file, plane);
+    }
+
+    EmojiData(Path file, int plane) throws IOException {
+        emojiProps = Files.readAllLines(file).stream()
+            .map(line -> line.split("#", 2)[0])
+            .filter(Predicate.not(String::isBlank))
+            .map(line -> line.split("[ \t]*;[ \t]*", 2))
+            .flatMap(map -> {
+                var range = map[0].split("\\.\\.", 2);
+                var start = Integer.valueOf(range[0], 16);
+                if ((start >> 16) != plane) {
+                    return Stream.empty();
+                } else {
+                    return range.length == 1 ?
+                        Stream.of(new AbstractMap.SimpleEntry<>(start, convertType(map[1].trim()))) :
+                        IntStream.rangeClosed(start, Integer.valueOf(range[1], 16))
+                            .mapToObj(cp -> new AbstractMap.SimpleEntry<>(cp, convertType(map[1].trim())));
+                }
+            })
+            .collect(Collectors.toMap(AbstractMap.SimpleEntry::getKey,
+                    AbstractMap.SimpleEntry::getValue,
+                    (v1, v2) -> v1 | v2));
+    }
+
+    long properties(int cp) {
+        return emojiProps.get(cp);
+    }
+
+    Set<Integer> codepoints() {
+        return emojiProps.keySet();
+    }
+
+    private static long convertType(String type) {
+        return switch (type) {
+            case "Emoji" -> GenerateCharacter.maskEmoji;
+            case "Emoji_Presentation" -> GenerateCharacter.maskEmojiPresentation;
+            case "Emoji_Modifier" -> GenerateCharacter.maskEmojiModifier;
+            case "Emoji_Modifier_Base" -> GenerateCharacter.maskEmojiModifierBase;
+            case "Emoji_Component" -> GenerateCharacter.maskEmojiComponent;
+            case "Extended_Pictographic" -> GenerateCharacter.maskExtendedPictographic;
+            default -> throw new InternalError("Unrecognizable Emoji type: " + type);
+        };
+    }
+}