Merge master jdk-17.0.4+3 into openj9-staging

Author: j9build

make/autoconf/basic_tools.m4

@@ -270,6 +270,8 @@ AC_DEFUN([BASIC_CHECK_TAR],
     TAR_TYPE="bsd"
   elif test "x$($TAR -v | $GREP "bsdtar")" != "x"; then
     TAR_TYPE="bsd"
+  elif test "x$($TAR --version | $GREP "busybox")" != "x"; then
+    TAR_TYPE="busybox"
   elif test "x$OPENJDK_BUILD_OS" = "xaix"; then
     TAR_TYPE="aix"
   fi
@@ -281,9 +283,12 @@ AC_DEFUN([BASIC_CHECK_TAR],
     TAR_SUPPORTS_TRANSFORM="true"
   elif test "x$TAR_TYPE" = "aix"; then
     # -L InputList of aix tar: name of file listing the files and directories
-    # that need to be   archived or extracted
+    # that need to be archived or extracted
     TAR_INCLUDE_PARAM="L"
     TAR_SUPPORTS_TRANSFORM="false"
+  elif test "x$TAR_TYPE" = "xbusybox"; then
+    TAR_INCLUDE_PARAM="T"
+    TAR_SUPPORTS_TRANSFORM="false"
   else
     TAR_INCLUDE_PARAM="I"
     TAR_SUPPORTS_TRANSFORM="false"

make/modules/java.desktop/lib/Awt2dLibraries.gmk

@@ -470,7 +470,6 @@ else
 
 endif
 
-
 LIBFONTMANAGER_EXTRA_HEADER_DIRS := \
     libharfbuzz \
     common/awt \
@@ -485,6 +484,14 @@ BUILD_LIBFONTMANAGER_FONTLIB +=  $(LIBFREETYPE_LIBS)
 
 LIBFONTMANAGER_OPTIMIZATION := HIGHEST
 
+ifneq ($(filter $(TOOLCHAIN_TYPE), gcc clang), )
+  # gcc (and to an extent clang) is particularly bad at optimizing these files,
+  # causing a massive spike in compile time. We don't care about these
+  # particular files anyway, so lower optimization level.
+  BUILD_LIBFONTMANAGER_hb-subset.cc_OPTIMIZATION := SIZE
+  BUILD_LIBFONTMANAGER_hb-subset-plan.cc_OPTIMIZATION := SIZE
+endif
+
 ifeq ($(call isTargetOs, windows), true)
   LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
       X11TextRenderer.c

src/java.base/share/classes/sun/nio/fs/PollingWatchService.java

@@ -61,6 +61,11 @@
 class PollingWatchService
     extends AbstractWatchService
 {
+    // Wait between polling thread creation and first poll (seconds)
+    private static final int POLLING_INIT_DELAY = 1;
+    // Default time between polls (seconds)
+    private static final int DEFAULT_POLLING_INTERVAL = 2;
+
     // map of registrations
     private final Map<Object, PollingWatchKey> map = new HashMap<>();
 
@@ -115,7 +120,7 @@ WatchKey register(final Path path,
             throw new IllegalArgumentException("No events to register");
 
         // Extended modifiers may be used to specify the sensitivity level
-        int sensitivity = 10;
+        int sensitivity = DEFAULT_POLLING_INTERVAL;
         if (modifiers.length > 0) {
             for (WatchEvent.Modifier modifier: modifiers) {
                 if (modifier == null)
@@ -247,6 +252,7 @@ void update(long lastModified, int tickCount) {
      * directory and queue keys when entries are added, modified, or deleted.
      */
     private class PollingWatchKey extends AbstractWatchKey {
+
         private final Object fileKey;
 
         // current event set
@@ -305,10 +311,10 @@ void enable(Set<? extends WatchEvent.Kind<?>> events, long period) {
                 // update the events
                 this.events = events;
 
-                // create the periodic task
+                // create the periodic task with initialDelay set to the specified constant
                 Runnable thunk = new Runnable() { public void run() { poll(); }};
                 this.poller = scheduledExecutor
-                    .scheduleAtFixedRate(thunk, period, period, TimeUnit.SECONDS);
+                    .scheduleAtFixedRate(thunk, POLLING_INIT_DELAY, period, TimeUnit.SECONDS);
             }
         }
 

src/java.base/windows/classes/java/lang/ProcessImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2022, 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
@@ -47,7 +47,6 @@
 import jdk.internal.access.JavaIOFileDescriptorAccess;
 import jdk.internal.access.SharedSecrets;
 import jdk.internal.ref.CleanerFactory;
-import sun.security.action.GetBooleanAction;
 import sun.security.action.GetPropertyAction;
 
 /* This class is for the exclusive use of ProcessBuilder.start() to
@@ -269,11 +268,22 @@ private static String createCommandLine(int verificationType,
                 // command line parser. The case of the [""] tail escape
                 // sequence could not be realized due to the argument validation
                 // procedure.
-                int count = countLeadingBackslash(verificationType, s, s.length());
-                while (count-- > 0) {
-                    cmdbuf.append(BACKSLASH);   // double the number of backslashes
+                if (verificationType == VERIFICATION_WIN32_SAFE ||
+                    verificationType == VERIFICATION_LEGACY) {
+                    int count = countLeadingBackslash(verificationType, s, s.length());
+                    while (count-- > 0) {
+                        cmdbuf.append(BACKSLASH);   // double the number of backslashes
+                    }
                 }
                 cmdbuf.append('"');
+            } else if (verificationType == VERIFICATION_WIN32_SAFE &&
+                 (s.startsWith("\"") && s.endsWith("\"") && s.length() > 2)) {
+                // Check that quoted argument does not escape the final quote
+                cmdbuf.append(s);
+                int count = countLeadingBackslash(verificationType, s, s.length() - 1);
+                while (count-- > 0) {
+                    cmdbuf.insert(cmdbuf.length() - 1, BACKSLASH);    // double the number of backslashes
+                }
             } else {
                 cmdbuf.append(s);
             }
@@ -282,19 +292,14 @@ private static String createCommandLine(int verificationType,
     }
 
     /**
-     * Return the argument without quotes (1st and last) if properly quoted, else the arg.
-     * A properly quoted string has first and last characters as quote and
-     * the last quote is not escaped.
+     * Return the argument without quotes (first and last) if quoted, otherwise the arg.
      * @param str a string
      * @return the string without quotes
      */
     private static String unQuote(String str) {
         if (!str.startsWith("\"") || !str.endsWith("\"") || str.length() < 2)
             return str;    // no beginning or ending quote, or too short not quoted
 
-        if (str.endsWith("\\\"")) {
-            return str;    // not properly quoted, treat as unquoted
-        }
         // Strip leading and trailing quotes
         return str.substring(1, str.length() - 1);
     }

src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c

@@ -73,6 +73,7 @@ typedef struct ThreadNode {
     unsigned int popFrameEvent : 1;
     unsigned int popFrameProceed : 1;
     unsigned int popFrameThread : 1;
+    unsigned int handlingAppResume : 1;
     EventIndex current_ei; /* Used to determine if we are currently handling an event on this thread. */
     jobject pendingStop;   /* Object we are throwing to stop the thread (ThreadReferenceImpl.stop). */
     jint suspendCount;
@@ -655,7 +656,10 @@ pendingAppResume(jboolean includeSuspended)
                 if (error != JVMTI_ERROR_NONE) {
                     EXIT_ERROR(error, "getting thread state");
                 }
-                if (!(state & JVMTI_THREAD_STATE_SUSPENDED)) {
+                /* !node->handlingAppResume && resumeFrameDepth > 0
+                 * means the thread has entered Thread.resume() */
+                if (!(state & JVMTI_THREAD_STATE_SUSPENDED) &&
+                    !node->handlingAppResume) {
                     return JNI_TRUE;
                 }
             }
@@ -728,6 +732,11 @@ blockOnDebuggerSuspend(jthread thread)
     }
 }
 
+/*
+ * The caller is expected to hold threadLock and handlerLock.
+ * eventHandler_createInternalThreadOnly() can deadlock because of
+ * wrong lock ordering if the caller does not hold handlerLock.
+ */
 static void
 trackAppResume(jthread thread)
 {
@@ -776,28 +785,19 @@ handleAppResumeBreakpoint(JNIEnv *env, EventInfo *evinfo,
                           struct bag *eventBag)
 {
     jthread resumer = evinfo->thread;
-    jthread resumee = getResumee(resumer);
 
     debugMonitorEnter(threadLock);
-    if (resumee != NULL) {
-        /*
-         * Hold up any attempt to resume as long as the debugger
-         * has suspended the resumee.
-         */
-        blockOnDebuggerSuspend(resumee);
-    }
 
+    /*
+     * Actual handling has to be deferred. We cannot block right here if the
+     * target of the resume call is suspended by the debugger since we are
+     * holding handlerLock which must not be released. See doPendingTasks().
+     */
     if (resumer != NULL) {
-        /*
-         * Track the resuming thread by marking it as being within
-         * a resume and by setting up for notification on
-         * a frame pop or exception. We won't allow the debugger
-         * to suspend threads while any thread is within a
-         * call to resume. This (along with the block above)
-         * ensures that when the debugger
-         * suspends a thread it will remain suspended.
-         */
-        trackAppResume(resumer);
+        ThreadNode* node = findThread(&runningThreads, resumer);
+        if (node != NULL) {
+            node->handlingAppResume = JNI_TRUE;
+        }
     }
 
     debugMonitorExit(threadLock);
@@ -2155,6 +2155,59 @@ threadControl_onEventHandlerEntry(jbyte sessionID, EventInfo *evinfo, jobject cu
 static void
 doPendingTasks(JNIEnv *env, ThreadNode *node)
 {
+    /* Deferred breakpoint handling for Thread.resume() */
+    if (node->handlingAppResume) {
+        jthread resumer = node->thread;
+        jthread resumee = getResumee(resumer);
+
+        if (resumer != NULL) {
+            /*
+             * trackAppResume indirectly aquires handlerLock. For proper lock
+             * ordering handlerLock has to be acquired before threadLock.
+             */
+            debugMonitorExit(threadLock);
+            eventHandler_lock();
+            debugMonitorEnter(threadLock);
+
+            /*
+             * Track the resuming thread by marking it as being within
+             * a resume and by setting up for notification on
+             * a frame pop or exception. We won't allow the debugger
+             * to suspend threads while any thread is within a
+             * call to resume. This (along with the block below)
+             * ensures that when the debugger
+             * suspends a thread it will remain suspended.
+             */
+            trackAppResume(resumer);
+
+            /*
+             * handlerLock is not needed anymore. We must release it before calling
+             * blockOnDebuggerSuspend() because it is required for resumes done by
+             * the debugger. If resumee is currently suspended by the debugger, then
+             * blockOnDebuggerSuspend() will block until a debugger resume is done.
+             * If it blocks while holding the handlerLock, then the resume will deadlock.
+             */
+            eventHandler_unlock();
+        }
+
+        if (resumee != NULL) {
+            /*
+             * Hold up any attempt to resume as long as the debugger
+             * has suspended the resumee.
+             */
+            blockOnDebuggerSuspend(resumee);
+        }
+
+        node->handlingAppResume = JNI_FALSE;
+
+        /*
+         * The blocks exit condition: resumee's suspendCount == 0.
+         *
+         * Debugger suspends are blocked if any thread is executing
+         * Thread.resume(), i.e. !handlingAppResume && frameDepth > 0.
+         */
+    }
+
     /*
      * Take care of any pending interrupts/stops, and clear out
      * info on pending interrupts/stops.
@@ -2455,6 +2508,8 @@ threadControl_reset(void)
     /* Everything should have been resumed */
     JDI_ASSERT(otherThreads.first == NULL);
 
+    /* Threads could be waiting in blockOnDebuggerSuspend */
+    debugMonitorNotifyAll(threadLock);
     debugMonitorExit(threadLock);
     eventHandler_unlock();
 }

test/hotspot/jtreg/compiler/blackhole/BlackholeIntrinsicTest.java

@@ -77,6 +77,15 @@ public class BlackholeIntrinsicTest {
         TESTS.put("bh_s_long_2",    BlackholeIntrinsicTest::test_long_2);
         TESTS.put("bh_s_double_2",  BlackholeIntrinsicTest::test_double_2);
         TESTS.put("bh_s_Object_2",  BlackholeIntrinsicTest::test_Object_2);
+
+        // Test calling static methods through instance method to exercise
+        // unusual intrinsic shapes.
+        TESTS.put("bh_is_int_0",    BlackholeIntrinsicTest::test_is_int_0);
+        TESTS.put("bh_is_Object_0", BlackholeIntrinsicTest::test_is_Object_0);
+        TESTS.put("bh_is_int_1",    BlackholeIntrinsicTest::test_is_int_1);
+        TESTS.put("bh_is_Object_1", BlackholeIntrinsicTest::test_is_Object_1);
+        TESTS.put("bh_is_int_2",    BlackholeIntrinsicTest::test_is_int_2);
+        TESTS.put("bh_is_Object_2", BlackholeIntrinsicTest::test_is_Object_2);
     }
 
     private static final int CYCLES = 100_000;
@@ -162,6 +171,13 @@ private static void test_int_0() {
         }
     }
 
+    private static void test_is_int_0() {
+        BlackholeTarget t = new BlackholeTarget();
+        for (int c = 0; c < CYCLES; c++) {
+            t.bh_is_int_0();
+        }
+    }
+
     private static void test_float_0() {
         for (int c = 0; c < CYCLES; c++) {
             BlackholeTarget.bh_s_float_0();
@@ -186,6 +202,13 @@ private static void test_Object_0() {
         }
     }
 
+    private static void test_is_Object_0() {
+        BlackholeTarget t = new BlackholeTarget();
+        for (int c = 0; c < CYCLES; c++) {
+            t.bh_is_Object_0();
+        }
+    }
+
     private static void test_boolean_1() {
         for (int c = 0; c < CYCLES; c++) {
             BlackholeTarget.bh_s_boolean_1((c & 0x1) == 0);
@@ -216,6 +239,13 @@ private static void test_int_1() {
         }
     }
 
+    private static void test_is_int_1() {
+        BlackholeTarget t = new BlackholeTarget();
+        for (int c = 0; c < CYCLES; c++) {
+            t.bh_is_int_1(c);
+        }
+    }
+
     private static void test_float_1() {
         for (int c = 0; c < CYCLES; c++) {
             BlackholeTarget.bh_s_float_1(c);
@@ -241,6 +271,14 @@ private static void test_Object_1() {
         }
     }
 
+    private static void test_is_Object_1() {
+        BlackholeTarget t = new BlackholeTarget();
+        for (int c = 0; c < CYCLES; c++) {
+            Object o = new Object();
+            t.bh_is_Object_1(o);
+        }
+    }
+
     private static void test_boolean_2() {
         for (int c = 0; c < CYCLES; c++) {
             BlackholeTarget.bh_s_boolean_2((c & 0x1) == 0, (c & 0x2) == 0);
@@ -271,6 +309,13 @@ private static void test_int_2() {
         }
     }
 
+    private static void test_is_int_2() {
+        BlackholeTarget t = new BlackholeTarget();
+        for (int c = 0; c < CYCLES; c++) {
+            t.bh_is_int_2(c, c + 1);
+        }
+    }
+
     private static void test_float_2() {
         for (int c = 0; c < CYCLES; c++) {
             BlackholeTarget.bh_s_float_2(c, c + 1);
@@ -296,4 +341,13 @@ private static void test_Object_2() {
             BlackholeTarget.bh_s_Object_2(o1, o2);
         }
     }
+
+    private static void test_is_Object_2() {
+        BlackholeTarget t = new BlackholeTarget();
+        for (int c = 0; c < CYCLES; c++) {
+            Object o1 = new Object();
+            Object o2 = new Object();
+            t.bh_is_Object_2(o1, o2);
+        }
+    }
 }