Revert "JBR-4993 Support using 'main' thread as EDT on macOS"

This reverts commit 1cd36c4c48.

src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp

@@ -128,12 +128,6 @@ frame os::fetch_frame_from_context(const void* ucVoid) {
   intptr_t* sp;
   intptr_t* fp;
   address epc = fetch_frame_from_context(ucVoid, &sp, &fp);
-  if (!is_readable_pointer(epc)) {
-    // Try to recover from calling into bad memory
-    // Assume new frame has not been set up, the same as
-    // compiled frame stack bang
-    return fetch_compiled_frame_from_context(ucVoid);
-  }
   return frame(sp, fp, epc);
 }
 
@@ -348,7 +342,7 @@ void os::print_context(outputStream *st, const void *context) {
   // Note: it may be unsafe to inspect memory near pc. For example, pc may
   // point to garbage if entry point in an nmethod is corrupted. Leave
   // this at the end, and hope for the best.
-  address pc = os::fetch_frame_from_context(uc).pc();
+  address pc = os::Posix::ucontext_get_pc(uc);
   print_instructions(st, pc, 4/*native instruction size*/);
   st->cr();
 }

src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp

@@ -142,12 +142,6 @@ frame os::fetch_frame_from_context(const void* ucVoid) {
   intptr_t* sp;
   intptr_t* fp;
   address epc = fetch_frame_from_context(ucVoid, &sp, &fp);
-  if (!is_readable_pointer(epc)) {
-    // Try to recover from calling into bad memory
-    // Assume new frame has not been set up, the same as
-    // compiled frame stack bang
-    return fetch_compiled_frame_from_context(ucVoid);
-  }
   return frame(sp, fp, epc);
 }
 
@@ -585,7 +579,7 @@ void os::print_context(outputStream *st, const void *context) {
   // Note: it may be unsafe to inspect memory near pc. For example, pc may
   // point to garbage if entry point in an nmethod is corrupted. Leave
   // this at the end, and hope for the best.
-  address pc = os::fetch_frame_from_context(uc).pc();
+  address pc = os::Posix::ucontext_get_pc(uc);
   print_instructions(st, pc, sizeof(char));
   st->cr();
 }

src/hotspot/os_cpu/windows_x86/os_windows_x86.cpp

@@ -319,12 +319,6 @@ frame os::fetch_frame_from_context(const void* ucVoid) {
   intptr_t* sp;
   intptr_t* fp;
   address epc = fetch_frame_from_context(ucVoid, &sp, &fp);
-  if (!is_readable_pointer(epc)) {
-    // Try to recover from calling into bad memory
-    // Assume new frame has not been set up, the same as
-    // compiled frame stack bang
-    return frame(sp + 1, fp, (address)*sp);
-  }
   return frame(sp, fp, epc);
 }
 
@@ -456,7 +450,7 @@ void os::print_context(outputStream *st, const void *context) {
   // Note: it may be unsafe to inspect memory near pc. For example, pc may
   // point to garbage if entry point in an nmethod is corrupted. Leave
   // this at the end, and hope for the best.
-  address pc = os::fetch_frame_from_context(uc).pc();
+  address pc = (address)uc->REG_PC;
   print_instructions(st, pc, sizeof(char));
   st->cr();
 }

src/hotspot/share/oops/method.cpp

@@ -2283,8 +2283,6 @@ bool Method::is_valid_method(const Method* m) {
   } else if ((intptr_t(m) & (wordSize-1)) != 0) {
     // Quick sanity check on pointer.
     return false;
-  } else if (!os::is_readable_range(m, m + 1)) {
-    return false;
   } else if (m->is_shared()) {
     return CppVtables::is_valid_shared_method(m);
   } else if (Metaspace::contains_non_shared(m)) {

src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java

@@ -946,16 +946,24 @@ public final class LWCToolkit extends LWToolkit {
     public static native void performOnMainThreadAndWait(Runnable r);
 
     /**
-     * Schedules the execution of the next AWT event from the event queue on the AppKit thread by creating a custom
-     * native NSEvent object and posting to the application's native event queue.
+     * Schedules event execution on the AppKit thread by wrapping it in native NSEvent object and posting to the
+     * application's native event queue.
      */
-    static native void scheduleEvent(EventQueue eventQueue);
+    static native void scheduleEvent(AWTEvent event);
 
-    static native void waitForNextEvent();
+    /**
+     * Retrieves event from the native application's event queue (and unwrapping it from NSEvent, see
+     * {@link #scheduleEvent(AWTEvent)})
+     */
+    static native AWTEvent getNextEvent(boolean removeFromQueue);
 
     // invoked from native code
-    private static void dispatch(EventQueue eventQueue) {
-        AWTAccessor.getEventQueueAccessor().dispatchEvent(eventQueue);
+    private static void dispatch(AWTEvent event) {
+        try {
+            AWTAccessor.getEventQueueAccessor().dispatchEvent(Toolkit.getDefaultToolkit().getSystemEventQueue(), event);
+        } catch (Throwable t) {
+            APPKIT_THREAD.getUncaughtExceptionHandler().uncaughtException(APPKIT_THREAD, t);
+        }
     }
 
 // DnD support
@@ -1253,22 +1261,19 @@ class MainThreadDispatcher implements FwDispatcher {
     }
 
     @Override
-    public boolean startDefaultDispatchThread() {
-        return false;
+    public boolean scheduleEvent(AWTEvent event) {
+        LWCToolkit.scheduleEvent(event);
+        return true;
     }
 
     @Override
-    public void scheduleNativeEvent(EventQueue eventQueue) {
-        LWCToolkit.scheduleEvent(eventQueue);
+    public boolean canGetEventsFromNativeQueue() {
+        return isDispatchThread();
     }
 
     @Override
-    public void waitForNativeEvent() {
-        if (isDispatchThread()) {
-            LWCToolkit.waitForNextEvent();
-        } else {
-            throw new IllegalStateException("getNextEvent() isn't supported in main thread dispatching mode");
-        }
+    public AWTEvent getNextEventFromNativeQueue(boolean removeFromQueue) {
+        return LWCToolkit.getNextEvent(removeFromQueue);
     }
 }
 

src/java.desktop/macosx/native/libawt_lwawt/awt/LWCToolkit.m

@@ -77,33 +77,34 @@ static pthread_cond_t sAppKitStarted_cv = PTHREAD_COND_INITIALIZER;
 static time_t YEAR_SECONDS = 60 * 60 * 24 * 365;
 
 @interface JavaAWTEvent : JavaEvent
-@property (readonly) jobject eventQueue;
+- (id)initWithEvent:(jobject)awtEvent;
+@property (readonly) jobject awtEvent;
 @end
 
 @implementation JavaAWTEvent
-- (id) initWithEventQueue:(jobject)eventQueue env:(JNIEnv*) env {
+
+- (id) initWithEvent:(jobject)awtEvent env:(JNIEnv*) env {
     if (self = [super init]) {
-        _eventQueue = (*env)->NewGlobalRef(env, eventQueue);
+        _awtEvent = (*env)->NewGlobalRef(env, awtEvent);
     }
     return self;
 }
 
 - (void) dealloc {
     JNIEnv *env = [ThreadUtilities getJNIEnvUncached];
-    if (_eventQueue) {
-        (*env)->DeleteGlobalRef(env, _eventQueue);
+    if (_awtEvent) {
+        (*env)->DeleteGlobalRef(env, _awtEvent);
     }
     [super dealloc];
 }
 
 - (void) dispatch {
 AWT_ASSERT_APPKIT_THREAD;
-    if (_eventQueue) {
-        [AWTToolkit eventCountPlusPlus];
+    if (_awtEvent) {
         JNIEnv* env = [ThreadUtilities getJNIEnv];
         DECLARE_CLASS(sjc_LWCToolkit, "sun/lwawt/macosx/LWCToolkit");
-        DECLARE_STATIC_METHOD(jm_LWCToolkit_dispatch, sjc_LWCToolkit, "dispatch", "(Ljava/awt/EventQueue;)V");
-        (*env)->CallStaticVoidMethod(env, sjc_LWCToolkit, jm_LWCToolkit_dispatch, _eventQueue);
+        DECLARE_STATIC_METHOD(jm_LWCToolkit_dispatch, sjc_LWCToolkit, "dispatch", "(Ljava/awt/AWTEvent;)V");
+        (*env)->CallStaticVoidMethod(env, sjc_LWCToolkit, jm_LWCToolkit_dispatch, _awtEvent);
         CHECK_EXCEPTION();
     }
 }
@@ -691,24 +692,46 @@ JNI_COCOA_EXIT(env);
 
 /*
  * Class:     sun_lwawt_macosx_LWCToolkit
- * Method:    waitForNextEvent
- * Signature: ()V
+ * Method:    getNextEvent
+ * Signature: (Z)Ljava/awt/AWTEvent;
  */
-JNIEXPORT void JNICALL Java_sun_lwawt_macosx_LWCToolkit_waitForNextEvent
-(JNIEnv *env, jclass clz)
+JNIEXPORT jobject JNICALL Java_sun_lwawt_macosx_LWCToolkit_getNextEvent
+(JNIEnv *env, jclass clz, jboolean removeFromQueue)
 {
 AWT_ASSERT_APPKIT_THREAD;
 JNI_COCOA_ENTER(env);
-    while (1) {
-        NSEvent *event = [NSApp nextEventMatchingMask:NSAnyEventMask
-                                            untilDate:NSDate.distantFuture
-                                               inMode:NSDefaultRunLoopMode
-                                              dequeue:YES];
-        JavaEvent *e = [NSApplicationAWT extractJavaEvent:event];
-        if (e) {
-            return;
+    if (removeFromQueue) {
+        while (1) {
+            NSEvent *event = [NSApp nextEventMatchingMask:NSAnyEventMask
+                                                untilDate:NSDate.distantFuture
+                                                   inMode:NSDefaultRunLoopMode
+                                                  dequeue:(BOOL)removeFromQueue];
+            JavaAWTEvent *e = [NSApplicationAWT extractJavaEvent:event];
+            if (e) {
+                return [e awtEvent];
+            }
+            [NSApp sendEvent:event];
+        }
+    } else {
+        while (1) {
+            NSEvent *event = [NSApp nextEventMatchingMask:NSAnyEventMask
+                                                untilDate:nil
+                                                   inMode:NSDefaultRunLoopMode
+                                                  dequeue:NO];
+            if (event == nil) {
+                return NULL;
+            }
+            JavaAWTEvent *e = [NSApplicationAWT extractJavaEvent:event];
+            if (e) {
+                return [e awtEvent];
+            }
+            event = [NSApp nextEventMatchingMask:NSAnyEventMask
+                                       untilDate:nil
+                                          inMode:NSDefaultRunLoopMode
+                                         dequeue:YES];
+            assert(event && ![NSApplicationAWT extractJavaEvent:event]);
+            [NSApp sendEvent:event];
         }
-        [NSApp sendEvent:event];
     }
 JNI_COCOA_EXIT(env);
 }
@@ -784,14 +807,14 @@ JNI_COCOA_EXIT(env);
 /*
  * Class:     sun_lwawt_macosx_LWCToolkit
  * Method:    scheduleEvent
- * Signature: (Ljava/awt/EventQueue;)V
+ * Signature: (Ljava/awt/AWTEvent)V
  */
 JNIEXPORT void JNICALL Java_sun_lwawt_macosx_LWCToolkit_scheduleEvent
-(JNIEnv *env, jclass clz, jobject eventQueue)
+(JNIEnv *env, jclass clz, jobject event)
 {
 JNI_COCOA_ENTER(env);
-    CHECK_NULL(eventQueue);
-    JavaAWTEvent* jae = [[JavaAWTEvent alloc] initWithEventQueue:eventQueue env:env];
+    CHECK_NULL(event);
+    JavaAWTEvent* jae = [[JavaAWTEvent alloc] initWithEvent:event env:env];
     [NSApplicationAWT postJavaEvent:jae];
     [jae release];
 JNI_COCOA_EXIT(env);

src/java.desktop/share/classes/java/awt/Container.java

@@ -2921,15 +2921,27 @@ public class Container extends Component {
         }
 
         Runnable pumpEventsForHierarchy = () -> {
-            EventDispatchThread dispatchThread;
-            Thread currentThread = Thread.currentThread();
-            if (currentThread instanceof EventDispatchThread) {
-                dispatchThread = (EventDispatchThread) currentThread;
+            Thread thread = Thread.currentThread();
+            if (thread instanceof EventDispatchThread edt) {
+                edt.pumpEventsForHierarchy(() -> nativeContainer.modalComp != null,
+                        Container.this);
             } else {
-                dispatchThread = Toolkit.getDefaultToolkit().getSystemEventQueue().getDispatchThread();
+                EventFilter filter = new EventDispatchThread.HierarchyEventFilter(Container.this);
+                while (nativeContainer.modalComp != null) {
+                    try {
+                        EventQueue eq = Toolkit.getEventQueue();
+                        AWTEvent event = eq.getNextEvent();
+                        if (filter.acceptEvent(event) == EventFilter.FilterAction.ACCEPT) {
+                            eq.dispatchEvent(event);
+                        } else {
+                            event.consume();
+                        }
+                    }
+                    catch (Throwable e) {
+                        thread.getUncaughtExceptionHandler().uncaughtException(thread, e);
+                    }
+                }
             }
-            dispatchThread.pumpEventsForHierarchy(() -> nativeContainer.modalComp != null,
-                    Container.this);
         };
 
         if (EventQueue.isDispatchThread()) {

src/java.desktop/share/classes/java/awt/EventQueue.java

@@ -235,8 +235,8 @@ public class EventQueue {
                 }
 
                 @Override
-                public void dispatchEvent(EventQueue eventQueue) {
-                    eventQueue.dispatchNextEvent();;
+                public void dispatchEvent(EventQueue eventQueue, AWTEvent event) {
+                    eventQueue.dispatchEvent(event);
                 }
             });
     }
@@ -374,10 +374,6 @@ public class EventQueue {
                 pushPopCond.signalAll();
             }
         }
-
-        if (fwDispatcher != null) {
-            fwDispatcher.scheduleNativeEvent(this);
-        }
     }
 
     private boolean coalescePaintEvent(PaintEvent e) {
@@ -562,6 +558,9 @@ public class EventQueue {
      *            if any thread has interrupted this thread
      */
     public AWTEvent getNextEvent() throws InterruptedException {
+        if (fwDispatcher != null && fwDispatcher.canGetEventsFromNativeQueue()) {
+            return fwDispatcher.getNextEventFromNativeQueue(true);
+        }
         do {
             /*
              * SunToolkit.flushPendingEvents must be called outside
@@ -569,11 +568,6 @@ public class EventQueue {
              * event queues are nested with push()/pop().
              */
             SunToolkit.flushPendingEvents(appContext);
-
-            if (fwDispatcher != null) {
-                fwDispatcher.waitForNativeEvent();
-            }
-
             pushPopLock.lock();
             try {
                 AWTEvent event = getNextEventPrivate();
@@ -650,6 +644,9 @@ public class EventQueue {
      * @return the first event
      */
     public AWTEvent peekEvent() {
+        if (fwDispatcher != null && fwDispatcher.canGetEventsFromNativeQueue()) {
+            return fwDispatcher.getNextEventFromNativeQueue(false);
+        }
         pushPopLock.lock();
         try {
             for (int i = NUM_PRIORITIES - 1; i >= 0; i--) {
@@ -736,9 +733,11 @@ public class EventQueue {
                 // In case fwDispatcher is installed and we're already on the
                 // dispatch thread (e.g. performing DefaultKeyboardFocusManager.sendMessage),
                 // dispatch the event straight away.
-                if (fwDispatcher == null || isDispatchThreadImpl()) {
+                // Also, AWTAutoShutdown event should be processed on EDT,
+                // as that event's purpose is to terminate EDT.
+                if (fwDispatcher == null || isDispatchThreadImpl() || src == AWTAutoShutdown.getInstance()) {
                     dispatchEventImpl(event, src);
-                } else {
+                } else if (!fwDispatcher.scheduleEvent(event)) {
                     fwDispatcher.scheduleDispatch(new Runnable() {
                         @Override
                         public void run() {
@@ -1144,9 +1143,7 @@ public class EventQueue {
                         }
                     }
                 );
-                if (fwDispatcher == null || fwDispatcher.startDefaultDispatchThread()) {
-                    dispatchThread.start();
-                }
+                dispatchThread.start();
             }
         } finally {
             pushPopLock.unlock();
@@ -1421,27 +1418,6 @@ public class EventQueue {
             fwDispatcher = dispatcher;
         }
     }
-
-    private void dispatchNextEvent() {
-        try {
-            AWTEvent event;
-            pushPopLock.lock();
-            try {
-                event = getNextEventPrivate();
-                if (event == null || peekEvent() == null) {
-                    AWTAutoShutdown.getInstance().notifyThreadFree(dispatchThread);
-                }
-            } finally {
-                pushPopLock.unlock();
-            }
-            if (event != null) {
-                dispatchEvent(event);
-            }
-        } catch (Throwable t) {
-            Thread thread = Thread.currentThread();
-            thread.getUncaughtExceptionHandler().uncaughtException(thread, t);
-        }
-    }
 }
 
 /**

src/java.desktop/share/classes/sun/awt/AWTAccessor.java

@@ -554,7 +554,10 @@ public final class AWTAccessor {
          */
         SecondaryLoop createSecondaryLoop(EventQueue eventQueue, BooleanSupplier cond);
 
-        void dispatchEvent(EventQueue eventQueue);
+        /**
+         * Dispatches event using the given EventQueue.
+         */
+        void dispatchEvent(EventQueue eventQueue, AWTEvent event);
     }
 
     /*

src/java.desktop/share/classes/sun/awt/FwDispatcher.java

@@ -59,11 +59,28 @@ public interface FwDispatcher {
      */
     SecondaryLoop createSecondaryLoop();
 
-    default boolean startDefaultDispatchThread() {
-        return true;
+    /**
+     * Schedules event dispatching on the appropriate thread. If this method returns {@code false},
+     * {@link #scheduleDispatch(Runnable)} method will be used instead.
+     */
+    default boolean scheduleEvent(AWTEvent event) {
+        return false;
     }
 
-    default void scheduleNativeEvent(EventQueue eventQueue) {}
+    /**
+     * If this method returns {@code true} on some thread, {@link #getNextEventFromNativeQueue(boolean)} method will be
+     * used to implement {@link EventQueue#getNextEvent()} and {@link EventQueue#peekEvent()} on that thread.
+     */
+    default boolean canGetEventsFromNativeQueue() {
+        return false;
+    }
 
-    default void waitForNativeEvent() {}
+    /**
+     * Allows to access events which were scheduled for execution on 'appropriate' thread by
+     * {@link #scheduleEvent(AWTEvent)} method. This method will (only) be used by {@link EventQueue#getNextEvent()} and
+     * {@link EventQueue#peekEvent()} implementation if {@link #canGetEventsFromNativeQueue()} returns {@code true}.
+     */
+    default AWTEvent getNextEventFromNativeQueue(boolean removeFromQueue) {
+        throw new UnsupportedOperationException();
+    }
 }

src/java.desktop/share/classes/sun/awt/SunToolkit.java

@@ -494,14 +494,10 @@ public abstract class SunToolkit extends Toolkit
         if (eventContext != null && !eventContext.equals(appContext)) {
             throw new RuntimeException("Event posted on wrong app context : " + event);
         }
-        if (isDispatchingOnMainThread()) {
-            getSystemEventQueueImplPP(appContext).postEvent(event);
-        } else {
-            PostEventQueue postEventQueue =
-                    (PostEventQueue) appContext.get(POST_EVENT_QUEUE_KEY);
-            if (postEventQueue != null) {
-                postEventQueue.postEvent(event);
-            }
+        PostEventQueue postEventQueue =
+            (PostEventQueue)appContext.get(POST_EVENT_QUEUE_KEY);
+        if (postEventQueue != null) {
+            postEventQueue.postEvent(event);
         }
     }
 
@@ -1628,7 +1624,7 @@ public abstract class SunToolkit extends Toolkit
      */
     @SuppressWarnings("serial")
     private final boolean waitForIdle(final long end) {
-        if (timeout(end) <= 0 || isDispatchingOnMainThread() /* syncNativeQueue should be enough in this case */) {
+        if (timeout(end) <= 0) {
             return false;
         }
         flushPendingEvents();

test/hotspot/jtreg/jbProblemList.txt

@@ -217,7 +217,7 @@ vmTestbase/vm/mlvm/indy/func/jvmti/redefineClassInBootstrap/TestDescription.java
 vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2none_a/TestDescription.java 8013267 generic-all
 vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manyDiff_b/TestDescription.java 8013267 generic-all
 vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manySame_b/TestDescription.java 8013267 generic-all
-vmTestbase/vm/mlvm/meth/stress/compiler/deoptimize/Test.java initial_run macos-aarch64
+vmTestbase/vm/mlvm/meth/stress/compiler/deoptimize/Test.java#id0 initial_run macos-aarch64
 
 
 vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn001/forceEarlyReturn001.java 7199837 generic-all

test/jdk/jbProblemList.txt

@@ -288,6 +288,7 @@ java/awt/image/multiresolution/MultiresolutionIconTest.java 8252812 windows-all,
 java/awt/image/multiresolution/MultiResolutionJOptionPaneIconTest.java 8253184,JBR-5510 windows-all,linux-5.18.2-arch1-1
 java/awt/print/Headless/HeadlessPrinterJob.java 8196088 windows-all
 sun/awt/datatransfer/SuplementaryCharactersTransferTest.java 8011371 generic-all
+sun/awt/dnd/8024061/bug8024061.java JBR-2604 windows-x64
 sun/awt/shell/ShellFolderMemoryLeak.java 8197794 windows-all
 sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java 8301177 generic-all
 sun/java2d/DirectX/OpaqueImageToSurfaceBlitTest/OpaqueImageToSurfaceBlitTest.java JBR-5393 windows-aarch64
@@ -312,6 +313,7 @@ sun/java2d/pipe/InterpolationQualityTest.java JBR-5328 windows-all
 
 sun/java2d/X11SurfaceData/SharedMemoryPixmapsTest/SharedMemoryPixmapsTest.sh 8221451,7184899,JBR-5359 linux-all,macosx-all,windows-aarch64,windows-x64
 java/awt/hidpi/ClientAreaOriginWindowsTest.java 8303491 windows-all
+java/awt/hidpi/SetMaximizedBoundsTest.java JBR-5443 windows-all
 java/awt/FullScreen/DisplayChangeVITest/DisplayChangeVITest.java 8169469 windows-all
 java/awt/print/PrinterJob/PSQuestionMark.java 7003378 generic-all
 java/awt/print/PrinterJob/GlyphPositions.java 7003378 generic-all
@@ -327,7 +329,7 @@ java/awt/Frame/MiscUndecorated/FrameCloseTest.java JBR-5210 windows-all
 java/awt/Frame/MiscUndecorated/RepaintTest.java 8266244,JBR-5786 macosx-aarch64,linux-all
 java/awt/Robot/HiDPIMouseClick/HiDPIRobotMouseClick.java 8253184 windows-all
 java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java 8157173 generic-all
-java/awt/Modal/FileDialog/FileDialogAppModal1Test.java 7186009,8253184 macosx-all,windows-all
+java/awt/Modal/FileDialog/FileDialogAppModal1Test.java 7186009,8253184,JBR-5827 macosx-all,windows-all,linux-all
 java/awt/Modal/FileDialog/FileDialogAppModal2Test.java 7186009,8253184 macosx-all,windows-all
 java/awt/Modal/FileDialog/FileDialogAppModal3Test.java 7186009,8253184 macosx-all,windows-all
 java/awt/Modal/FileDialog/FileDialogAppModal4Test.java 7186009,8253184 macosx-all,windows-all
@@ -599,6 +601,8 @@ java/awt/dnd/DisposeFrameOnDragCrash/DisposeFrameOnDragTest.java 8202790 macosx-
 java/awt/Choice/ChoicePopupLocation/ChoicePopupLocation.java 8202931 macosx-all,linux-all
 java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.java 7124275 macosx-all
 java/awt/Focus/NonFocusableWindowTest/NonfocusableOwnerTest.java 8280392
+java/awt/Focus/NoFocusOwnerAWTTest.java JBR-5825 windows-all
+java/awt/Focus/NoFocusOwnerSwingTest.java JBR-5825 windows-all
 java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java 6848810,JBR-5210 macosx-all,linux-all,windows-all
 java/awt/FileDialog/ModalFocus/FileDialogModalFocusTest.java 8194751,JBR-5359 linux-all,windows-aarch64
 java/awt/image/VolatileImage/BitmaskVolatileImage.java 8133102 linux-all
@@ -616,6 +620,7 @@ java/awt/Toolkit/ToolkitPropertyTest/ToolkitPropertyTest_Enable.java 6847163
 java/awt/xembed/server/RunTestXEmbed.java 7034201 linux-all
 java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsDocModalTest.java 8164473 linux-all
 java/awt/im/memoryleak/InputContextMemoryLeakTest.java 8023814 linux-all,windows-all
+java/awt/Frame/DecoratedFrameInsets/DecoratedFrameInsetsTest.java JBR-5205 linux-5.4.0-1101-aws
 java/awt/Frame/DisposeParentGC/DisposeParentGC.java 8079786 macosx-all
 
 java/awt/GraphicsDevice/CheckDisplayModes.java 8266242 macosx-aarch64
@@ -834,7 +839,7 @@ javax/sound/midi/Sequencer/Recording.java 8167580 linux-all
 
 ############################################################################
 
-javax/imageio/plugins/external_plugin_tests/TestClassPathPlugin.sh JBR-5363 window-all
+javax/imageio/plugins/external_plugin_tests/TestClassPathPlugin.sh JBR-5363 windows-all
 
 # jdk_swing
 
@@ -846,7 +851,7 @@ javax/swing/plaf/basic/BasicTreeUI/8023474/bug8023474.java 8253184 linux-all,win
 javax/swing/plaf/nimbus/8041642/bug8041642.java 8253184,JBR-5510 windows-all,linux-5.18.2-arch1-1
 javax/swing/plaf/nimbus/8057791/bug8057791.java 8253184,JBR-5510 windows-all,linux-5.18.2-arch1-1
 javax/swing/plaf/nimbus/TestNimbusBGColor.java JBR-5359 windows-aarch64
-javax/swing/plaf/nimbus/TestNimbusOverride.java 8253184 windows-all
+javax/swing/plaf/nimbus/TestNimbusOverride.java 8253184,JBR-5829 windows-all,linux-all
 javax/swing/plaf/windows/6921687/bug6921687.java 8253184 windows-all
 javax/swing/plaf/windows/WindowsRootPaneUI/WrongAltProcessing/WrongAltProcessing.java JBR-4372 windows-all
 
@@ -959,7 +964,7 @@ javax/swing/text/html/StyleSheet/bug4936917.java 8277816,JBR-899,JBR-5510 window
 javax/swing/plaf/metal/MetalBorders/ScaledMetalBorderTest.java JBR-5779 linux-all
 javax/swing/plaf/metal/MetalGradient/8163193/ButtonGradientTest.java 8277816,8253184,JBR-5510 macosx-aarch64,windows-all,linux-5.18.2-arch1-1
 javax/swing/plaf/synth/7158712/bug7158712.java JBR-125 windows-all
-javax/swing/plaf/synth/SynthButtonUI/6276188/bug6276188.java 8253184,JBR-5510 windows-all,linux-5.18.2-arch1-1
+javax/swing/plaf/synth/SynthButtonUI/6276188/bug6276188.java 8253184,JBR-5510,JBR-803 windows-all,linux-5.18.2-arch1-1,linux-all
 javax/swing/plaf/synth/SynthScrollbarThumbPainter/SynthScrollbarThumbPainterTest.java 8253184 windows-all
 javax/swing/JInternalFrame/5066752/bug5066752.java 8253184,JBR-5510 windows-all,linux-5.18.2-arch1-1
 javax/swing/JInternalFrame/8160248/JInternalFrameDraggingTest.java  8277816,JBR-5359,JBR-5510 macosx-aarch64,windows-aarch64,linux-5.18.2-arch1-1
@@ -986,7 +991,7 @@ sanity/client/SwingSet/src/DialogDemoTest.java 8253184 windows-all
 sanity/client/SwingSet/src/FrameDemoTest.java 8253184 windows-all
 sanity/client/SwingSet/src/InternalFrameDemoTest.java 8253184 windows-all
 sanity/client/SwingSet/src/GridBagLayoutDemoTest.java 8253184 windows-all
-sanity/client/SwingSet/src/TextFieldDemoTest.java JBR-5061 linux-5.15.0-39-generic Ubuntu-22.04
+sanity/client/SwingSet/src/TextFieldDemoTest.java JBR-5061 linux-all
 sanity/client/SwingSet/src/ToolTipDemoTest.java 8225012 windows-all,macosx-all
 sanity/client/SwingSet/src/ScrollPaneDemoTest.java 8225013 linux-all
 sanity/client/SwingSet/src/SliderDemoTest.java 8253184 windows-all
@@ -1180,9 +1185,11 @@ com/sun/java/swing/plaf/windows/Test8173145.java
 com/sun/java/swing/plaf/windows/AltFocusIssueTest.java                              JBR-4197 windows-all
 
 java/awt/event/MouseEvent/AltGraphModifierTest/AltGraphModifierTest.java            JBR-4207 windows-all
+jb/java/awt/Focus/TitleBarClickTest.java                                            JBR-3180 linux-5.18.2-arch1-1
 jb/java/awt/Graphics2D/TextRender/OGLMetalTextRender.java                           JBR-5392 windows-aarch64
 jb/java/awt/event/TouchScreenEvent/TouchScreenEventsTestLinux.sh                    JBR-4078 linux-all
 jb/java/awt/Font/Font467.java                                                       JBR-3960 generic-all
+jb/java/awt/Font/font430.sh                                                         JBR-4956 linux-all
 jb/java/awt/keyboard/AltGrMustGenerateAltGrModifierTest4207.java                    JBR-4207 windows-all
 jb/java/awt/Toolkit/AWTThreadingTest.java                                           JBR-4350 macosx-all
 java/awt/Toolkit/LockingKeyStateTest/LockingKeyStateTest.java                       JBR-5765 macosx-all
@@ -1219,6 +1226,10 @@ javax/swing/text/FlowView/LayoutTest.java JBR-4880 windows-all
 javax/swing/text/html/7189299/bug7189299.java JBR-4880 windows-all
 jb/java/jcef/HandleJSQueryTest3314.sh JBR-4866 linux-all
 
+#exclude keyboard tests on virtual macOS11 agents
+jb/sun/awt/macos/InputMethodTest/KeyCodesTest.java nobug macos-11.7.6
+jb/sun/awt/macos/InputMethodTest/PinyinCapsLockTest.java nobug macos-11.7.6
+
 jb/sun/awt/macos/InputMethodTest/FocusMoveUncommitedCharactersTest.java JBR-5765 macosx-all
 jb/sun/awt/macos/KeyPressAndHoldTest.java JBR-4901 macosx-all
 jb/sun/awt/macos/NationalLayoutTest/Layout_ABC.java JBR-4933 macosx-all
@@ -1281,6 +1292,7 @@ java/awt/Graphics/CopyScaledArea/CopyScaledAreaTest.java JBR-5359 windows-aarch6
 java/awt/Graphics2D/FillTexturePaint/FillTexturePaint.java JBR-5359 windows-aarch64
 java/awt/Graphics2D/FlipDrawImage/FlipDrawImage.java JBR-5359 windows-aarch64
 java/awt/hidpi/DrawOnFrameGraphicsTest.java JBR-5359 windows-aarch64
+java/awt/hidpi/properties/HiDPIPropertiesUnixTest.java JBR-495 macosx-all
 java/awt/image/DrawImage/EABlitTest.java JBR-5359 windows-aarch64
 java/awt/image/DrawImage/IncorrectBounds.java JBR-5359 windows-aarch64
 java/awt/image/DrawImage/IncorrectDestinationOffset.java JBR-5359 windows-aarch64
@@ -1298,6 +1310,7 @@ java/awt/Mixing/OpaqueTest.java JBR-5707 linux-all
 java/awt/Mixing/OverlappingButtons.java JBR-5707 linux-all
 java/awt/Window/BackgroundIsNotUpdated/BackgroundIsNotUpdated.java JBR-5359,JBR-5510 windows-aarch64,linux-5.18.2-arch1-1
 java/awt/Window/TranslucentJAppletTest/TranslucentJAppletTest.java JBR-5359,JBR-5510 windows-aarch64,linux-5.18.2-arch1-1
+java/awt/Window/WindowAppearanceTest/WindowAppearanceTest.java JBR-3691,JBR-3773 macosx-x64,macosx-aarch64
 javax/swing/JComponent/7154030/bug7154030.java JBR-5359,JBR-5510 windows-aarch64,linux-5.18.2-arch1-1
 javax/swing/JEditorPane/TestBrowserBGColor.java JBR-5359,JBR-5510 windows-aarch64,linux-5.18.2-arch1-1
 javax/swing/JPopupMenu/7156657/bug7156657.java JBR-5359 windows-aarch64
@@ -1312,6 +1325,7 @@ jb/java/awt/CustomTitleBar/JDialogNativeControlsTest.java JBR-5359,JBR-5345 wind
 jb/java/awt/CustomTitleBar/HitTestClientArea.java JBR-5551 windows-all
 jb/java/awt/CustomTitleBar/HitTestNonClientArea.java JBR-5550 windows-all
 jb/java/awt/CustomTitleBar/MaximizeWindowTest.java JBR-5550 windows-all
+jb/java/awt/CustomTitleBar/MaximizedWindowFocusTest.java JBR-5828 windows-10.0
 jb/java/awt/CustomTitleBar/MinimizingWindowTest.java JBR-5359,JBR-5345 windows-aarch64,windows-x64
 jb/java/awt/CustomTitleBar/NativeControlsVisibilityTest.java JBR-5359,JBR-5345 windows-aarch64,windows-x64
 jb/java/awt/CustomTitleBar/WindowsControlWidthTest.java JBR-5359,JBR-5345 windows-aarch64,windows-x64
@@ -1323,7 +1337,7 @@ sun/java2d/GdiRendering/InsetClipping.java 7124403,JBR-5359,JBR-5510 windows-x64
 java/awt/Choice/PopdownGeneratesMouseEvents/PopdownGeneratesMouseEvents.java JBR-5510 linux-5.18.2-arch1-1
 java/awt/Insets/DialogInsets.java JBR-5510 linux-5.18.2-arch1-1
 java/awt/Menu/OpensWithNoGrab/OpensWithNoGrab.java JBR-5510 linux-5.18.2-arch1-1
-javax/swing/JFormattedTextField/TestSelectedTextBackgroundColor.java JBR-5510 linux-5.18.2-arch1-1
+javax/swing/JFormattedTextField/TestSelectedTextBackgroundColor.java JBR-5510,JBR-4477 linux-5.18.2-arch1-1,linux-5.4.0-1101-aws
 javax/swing/JMenu/JMenuSelectedColorTest.java JBR-5510 linux-5.18.2-arch1-1
 javax/swing/JSpinner/4670051/DateFieldUnderCursorTest.java JBR-5510 linux-5.18.2-arch1-1
 javax/swing/JSpinner/4788637/bug4788637.java JBR-5510 linux-5.18.2-arch1-1
@@ -1331,4 +1345,6 @@ javax/swing/LookAndFeel/8145547/DemandGTK2.sh JBR-5510 linux-5.18.2-arch1-1
 javax/swing/LookAndFeel/8145547/DemandGTK3.sh JBR-5510 linux-5.18.2-arch1-1
 
 java/awt/Toolkit/LockingKeyStateTest/LockingKeyStateTest.java JBR-5765 macosx-all
-jb/sun/awt/macos/InputMethodTest/FocusMoveUncommitedCharactersTest.java JBR-5765 macosx-all
+jb/sun/awt/macos/InputMethodTest/FocusMoveUncommitedCharactersTest.java JBR-5765 macosx-all
+
+native_sanity/simplenativelauncher/ProgramTest.java JBR-5287 windows-aarch64

test/jdk/jbcommitProblemList.txt

@@ -64,7 +64,6 @@ javax/swing/JWindow/ShapedAndTranslucentWindows/ShapedTranslucentPerPixelTranslu
 javax/swing/JWindow/ShapedAndTranslucentWindows/TranslucentJComboBox.java 8024627 macosx-all,windows-all
 javax/swing/JWindow/ShapedAndTranslucentWindows/TranslucentWindowClickSwing.java nobug windows-all
 javax/swing/plaf/nimbus/8057791/bug8057791.java nobug windows-all
-javax/swing/plaf/nimbus/TestNimbusOverride.java nobug linux-all,windows-all
 javax/swing/plaf/windows/6921687/bug6921687.java nobug windows-all
 javax/swing/ProgressMonitor/ProgressMonitorEscapeKeyPress.java nobug windows-all
 javax/swing/text/CSSBorder/6796710/bug6796710.java nobug windows-all