[GR-50849] Merge in tag jdk-22+27.

PullRequest: labsjdk-ce/41

Author: OracleLabsAutomation

.github/workflows/test.yml

@@ -60,7 +60,9 @@ jobs:
           - 'jdk/tier1 part 3'
           - 'langtools/tier1'
           - 'hs/tier1 common'
-          - 'hs/tier1 compiler'
+          - 'hs/tier1 compiler part 1'
+          - 'hs/tier1 compiler part 2'
+          - 'hs/tier1 compiler part 3'
           - 'hs/tier1 gc'
           - 'hs/tier1 runtime'
           - 'hs/tier1 serviceability'
@@ -83,8 +85,16 @@ jobs:
             test-suite: 'test/hotspot/jtreg/:tier1_common'
             debug-suffix: -debug
 
-          - test-name: 'hs/tier1 compiler'
-            test-suite: 'test/hotspot/jtreg/:tier1_compiler'
+          - test-name: 'hs/tier1 compiler part 1'
+            test-suite: 'test/hotspot/jtreg/:tier1_compiler_1'
+            debug-suffix: -debug
+
+          - test-name: 'hs/tier1 compiler part 2'
+            test-suite: 'test/hotspot/jtreg/:tier1_compiler_2 test/hotspot/jtreg/:tier1_compiler_not_xcomp'
+            debug-suffix: -debug
+
+          - test-name: 'hs/tier1 compiler part 3'
+            test-suite: 'test/hotspot/jtreg/:tier1_compiler_3'
             debug-suffix: -debug
 
           - test-name: 'hs/tier1 gc'

ci.jsonnet

@@ -31,6 +31,9 @@ local contains(str, needle) = std.findSubstr(needle, str) != [];
             ZLIB_BUNDLING: "system",
             MX_PYTHON: "python3.8"
         },
+        packages+: {
+            cmake: "==3.22.2",
+        },
     },
 
     Windows:: self.OSBase + {
@@ -243,7 +246,7 @@ local contains(str, needle) = std.findSubstr(needle, str) != [];
     # Downstream Graal branch to test against. If you change this value to anything but
     # "master", you must create an ol-jira issue to change it back to master once the
     # next JVMCI release has been made. Add the issue id as a comment here.
-    local downstream_branch = "labsjdk/automation-11-30-2023-3913",
+    local downstream_branch = "labsjdk/automation-12-8-2023-8501",
 
     local clone_graal(defs) = {
         # Checkout the graal-enterprise repo to the "_gate" version of the

make/CompileInterimLangtools.gmk

@@ -99,6 +99,9 @@ define SetupInterimModule
       EXCLUDE_FILES := $(TOPDIR)/src/$1/share/classes/module-info.java \
           $(TOPDIR)/src/$1/share/classes/javax/tools/ToolProvider.java \
           $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/Main.java \
+          $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/MemoryContext.java \
+          $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/MemoryModuleFinder.java \
+          $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/SourceLauncher.java \
           Standard.java, \
       EXTRA_FILES := $(BUILDTOOLS_OUTPUTDIR)/gensrc/$1.interim/module-info.java \
           $($1.interim_EXTRA_FILES), \

make/autoconf/basic_tools.m4

@@ -390,6 +390,17 @@ AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS],
 
   if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
     UTIL_REQUIRE_PROGS(DSYMUTIL, dsymutil)
+    AC_MSG_CHECKING([if dsymutil supports --reproducer option])
+    if $DSYMUTIL --help | $GREP -q '\--reproducer '; then
+      AC_MSG_RESULT([yes])
+      # --reproducer option is supported
+      # set "--reproducer Off" to prevent unnecessary temporary
+      # directories creation
+      DSYMUTIL="$DSYMUTIL --reproducer Off"
+    else
+      # --reproducer option isn't supported
+      AC_MSG_RESULT([no])
+    fi
     UTIL_REQUIRE_PROGS(MIG, mig)
     UTIL_REQUIRE_PROGS(XATTR, xattr)
     UTIL_LOOKUP_PROGS(CODESIGN, codesign)

make/jdk/src/classes/build/tools/module/GenModuleInfoSource.java

@@ -473,6 +473,11 @@ private void process(Parser parser, boolean extraFile) throws IOException {
                     if (parser.peekToken() != null) {  // must be EOF
                         throw parser.newError("is malformed");
                     }
+                } else if (token.equals("import")) {
+                    nextIdentifier(parser);
+                    skipTokenOrThrow(parser, ";", "missing semicolon");
+                } else if (token.startsWith("@")) {
+                    continue;
                 } else {
                     throw parser.newError("missing keyword");
                 }

make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java

@@ -36,8 +36,8 @@ EXCLUDE_FILES += \
   $(TOPDIR)/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java
 
 EXCLUDES += java/lang/doc-files \
-    jdk/internal/classfile/snippet-files \
-    jdk/internal/classfile/components/snippet-files
+    java/lang/classfile/snippet-files \
+    java/lang/classfile/components/snippet-files
 
 # Exclude BreakIterator classes that are just used in compile process to generate
 # data files and shouldn't go in the product

make/modules/java.base/Java.gmk

@@ -42,6 +42,9 @@ CT_MODULES_API_TARGETS := \
     $(foreach m, $(CT_MODULES) $(CT_TRANSITIVE_MODULES), \
       $(call SetupJavaCompilationApiTarget, $m, $(JDK_OUTPUTDIR)/modules/$m))
 
+#undocumented modules which should also be included in ct.sym:
+CT_EXTRA_MODULES := jdk.unsupported
+
 SYMBOL_FILES := $(wildcard $(MODULE_SRC)/share/data/symbols/*)
 
 CT_DATA_DESCRIPTION += $(MODULE_SRC)/share/data/symbols/symbols
@@ -72,6 +75,7 @@ $(SUPPORT_OUTPUTDIR)/symbols/ct.sym: $(COMPILE_CREATE_SYMBOLS) $(SYMBOL_FILES) \
 	$(RM) -r $(@D)
 	$(MKDIR) -p $(@D)
 	$(ECHO) Creating ct.sym classes
+	$(ECHO) $(CT_MODULES) $(CT_TRANSITIVE_MODULES) $(CT_EXTRA_MODULES) >$(SUPPORT_OUTPUTDIR)/symbols/included-modules
 	$(BUILD_JAVA_SMALL) \
 	    $(COMPILECREATESYMBOLS_ADD_EXPORTS) \
 	    -classpath $(BUILDTOOLS_OUTPUTDIR)/create_symbols_javac \
@@ -82,7 +86,8 @@ $(SUPPORT_OUTPUTDIR)/symbols/ct.sym: $(COMPILE_CREATE_SYMBOLS) $(SYMBOL_FILES) \
 	    $(SOURCE_DATE_EPOCH) \
 	    $(JDK_SOURCE_TARGET_VERSION) \
 	    "$(VERSION_PRE)" \
-	    $(JDK_OUTPUTDIR)/modules/
+	    $(JDK_OUTPUTDIR)/modules/ \
+	    $(SUPPORT_OUTPUTDIR)/symbols/included-modules
 	$(TOUCH) $@
 
 # Copy ct.sym to the modules libs dir

make/modules/jdk.compiler/Gendata.gmk

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -198,6 +198,7 @@ static class TypeElement {
         String period = "";
         boolean cutoff;
         boolean throttle;
+        String level = "";
         boolean experimental;
         boolean internal;
         long id;
@@ -222,6 +223,7 @@ public void persist(DataOutputStream pos) throws IOException {
             pos.writeUTF(period);
             pos.writeBoolean(cutoff);
             pos.writeBoolean(throttle);
+            pos.writeUTF(level);
             pos.writeBoolean(experimental);
             pos.writeBoolean(internal);
             pos.writeLong(id);
@@ -520,6 +522,7 @@ public void startElement(String uri, String localName, String qName, Attributes
                 currentType.startTime = getBoolean(attributes, "startTime", true);
                 currentType.period = getString(attributes, "period");
                 currentType.cutoff = getBoolean(attributes, "cutoff", false);
+                currentType.level = getString(attributes, "level");
                 currentType.throttle = getBoolean(attributes, "throttle", false);
                 currentType.commitState = getString(attributes, "commitState");
                 currentType.isEvent = "Event".equals(qName);
@@ -651,7 +654,7 @@ private static void printJfrEventControlHpp(Metadata metadata, File outputFile)
             out.write("");
             out.write("struct jfrNativeEventSetting {");
             out.write("  jlong  threshold_ticks;");
-            out.write("  jlong  cutoff_ticks;");
+            out.write("  jlong  miscellaneous;");
             out.write("  u1     stacktrace;");
             out.write("  u1     enabled;");
             out.write("  u1     large;");

make/src/classes/build/tools/jfr/GenerateJfrFiles.java

@@ -98,11 +98,6 @@ $(eval $(call SetupJavaCompilation, BUILD_JDK_MICROBENCHMARK, \
     BIN := $(MICROBENCHMARK_CLASSES), \
     JAVAC_FLAGS := --add-exports java.base/sun.security.util=ALL-UNNAMED \
         --add-exports java.base/sun.invoke.util=ALL-UNNAMED \
-        --add-exports java.base/jdk.internal.classfile=ALL-UNNAMED \
-        --add-exports java.base/jdk.internal.classfile.attribute=ALL-UNNAMED \
-        --add-exports java.base/jdk.internal.classfile.constantpool=ALL-UNNAMED \
-        --add-exports java.base/jdk.internal.classfile.instruction=ALL-UNNAMED \
-        --add-exports java.base/jdk.internal.classfile.components=ALL-UNNAMED \
         --add-exports java.base/jdk.internal.classfile.impl=ALL-UNNAMED \
         --add-exports java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED \
         --add-exports java.base/jdk.internal.org.objectweb.asm.tree=ALL-UNNAMED \