Revert "JBR-8651 Pycharm Crashing after lock/sleep: SIGABRT at # C [libsystem_kernel.dylib+0x9388] __pthread_kill / __displaycb_handle_block_invoke"

This reverts commit 986d578.

Author: bourgesl

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

@@ -741,7 +741,8 @@ - (jobject)awtComponent:(JNIEnv*)env
     DECLARE_CLASS_RETURN(jc_CPlatformView, "sun/lwawt/macosx/CPlatformView", NULL);
     DECLARE_FIELD_RETURN(jf_Peer, jc_CPlatformView, "peer", "Lsun/lwawt/LWWindowPeer;", NULL);
     if ((env == NULL) || (m_cPlatformView == NULL)) {
-        NSAPP_AWT_LOG_MESSAGE(@"Apple AWT: Error AWTView:awtComponent given bad parameters.");
+        NSLog(@"Apple AWT : Error AWTView:awtComponent given bad parameters.");
+        NSLog(@"%@",[NSThread callStackSymbols]);
         return NULL;
     }
 
@@ -754,7 +755,8 @@ - (jobject)awtComponent:(JNIEnv*)env
     DECLARE_CLASS_RETURN(jc_LWWindowPeer, "sun/lwawt/LWWindowPeer", NULL);
     DECLARE_FIELD_RETURN(jf_Target, jc_LWWindowPeer, "target", "Ljava/awt/Component;", NULL);
     if (peer == NULL) {
-        NSAPP_AWT_LOG_MESSAGE(@"Apple AWT: Error AWTView:awtComponent got null peer from CPlatformView");
+        NSLog(@"Apple AWT : Error AWTView:awtComponent got null peer from CPlatformView");
+        NSLog(@"%@",[NSThread callStackSymbols]);
         return NULL;
     }
     jobject comp = (*env)->GetObjectField(env, peer, jf_Target);

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

@@ -232,9 +232,10 @@ - (void)_changeJustMain {
         };
         void (*_objc_msgSendSuper)(struct objc_super *, SEL) = (void *)&objc_msgSendSuper; //cast our pointer so the compiler can sort out the ABI
         (*_objc_msgSendSuper)(&mySuper, @selector(_changeJustMain));
-    } @catch (NSException *exception) {
+    } @catch (NSException *ex) {
         NSLog(@"WARNING: suppressed exception from _changeJustMain (workaround for JBR-2562)");
-        NSAPP_AWT_LOG_EXCEPTION(exception);
+        NSProcessInfo *processInfo = [NSProcessInfo processInfo];
+        [NSApplicationAWT logException:ex forProcess:processInfo];
     }
 }
 
@@ -1058,9 +1059,10 @@ - (void) _deliverMoveResizeEvent {
     NSRect frame;
     @try {
         frame = ConvertNSScreenRect(env, [self.nsWindow frame]);
-    } @catch (NSException *exception) {
+    } @catch (NSException *e) {
         NSLog(@"WARNING: suppressed exception from ConvertNSScreenRect() in [AWTWindow _deliverMoveResizeEvent]");
-        NSAPP_AWT_LOG_EXCEPTION(exception);
+        NSProcessInfo *processInfo = [NSProcessInfo processInfo];
+        [NSApplicationAWT logException:e forProcess:processInfo];
         return;
     }
 
@@ -1394,9 +1396,7 @@ - (CGFloat) customTitleBarHeight {
         jobject target = (*env)->GetObjectField(env, platformWindow, jf_target);
         if (target) {
             h = (CGFloat) (*env)->CallFloatMethod(env, target, jm_internalCustomTitleBarHeight);
-            if ((*env)->ExceptionCheck(env)) {
-                (*env)->ExceptionDescribe(env);
-            } else {
+            if (!(*env)->ExceptionCheck(env)) {
                 self.customTitleBarControlsVisible = (BOOL) (*env)->CallBooleanMethod(env, target, jm_internalCustomTitleBarControlsVisible);
             }
             (*env)->DeleteLocalRef(env, target);
@@ -1565,8 +1565,8 @@ - (void)sendEvent:(NSEvent *)event {
                     GET_CPLATFORM_WINDOW_CLASS();
                     DECLARE_METHOD(jm_deliverNCMouseDown, jc_CPlatformWindow, "deliverNCMouseDown", "()V");
                     (*env)->CallVoidMethod(env, platformWindow, jm_deliverNCMouseDown);
-                    (*env)->DeleteLocalRef(env, platformWindow);
                     CHECK_EXCEPTION();
+                    (*env)->DeleteLocalRef(env, platformWindow);
                 }
             }
         }
@@ -2234,7 +2234,6 @@ - (void)drawButton: (int)index {
         DECLARE_METHOD_RETURN(jm_isIgnoreMouseEvents, jc_Window, "isIgnoreMouseEvents", "()Z", 0);
         isIgnoreMouseEvents = (*env)->CallBooleanMethod(env, awtWindow, jm_isIgnoreMouseEvents) == JNI_TRUE ? YES : NO;
         (*env)->DeleteLocalRef(env, awtWindow);
-        CHECK_EXCEPTION();
     }
     [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
 

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

@@ -126,7 +126,7 @@ + (ApplicationDelegate *)sharedDelegate {
     BOOL isApplicationOwner = NO;
     if (NSApp != nil) {
         if ([NSApp isMemberOfClass:[NSApplication class]] && overrideDelegate) shouldInstall = YES;
-        if ([NSApplicationAWT isNSApplicationAWT]) {
+        if ([NSApp isKindOfClass:[NSApplicationAWT class]]) {
             shouldInstall = YES;
             isApplicationOwner = YES;
         }
@@ -213,7 +213,7 @@ - (id) init {
 
     // Prep for about and preferences menu
     BOOL usingDefaultNib = YES;
-    if ([NSApplicationAWT isNSApplicationAWT]) {
+    if ([NSApp isKindOfClass:[NSApplicationAWT class]]) {
         usingDefaultNib = [NSApp usingDefaultNib];
     }
     if (!usingDefaultNib) return self;

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

@@ -102,7 +102,6 @@ static void TransferFailed(JNIEnv *env, jobject jthis, jlong jdroptarget, jlong
     // Pass the data to drop target:
     @try {
         (*env)->CallVoidMethod(env, jthis, newDataMethod, jformat, jdropdata); // AWT_THREADING Safe (!appKit)
-        CHECK_EXCEPTION();
     } @catch (NSException *ex) {
         DLog2(@"[CDropTargetContextPeer startTransfer]: exception in newData() for %d.\n", (NSInteger) jdroptarget);
         (*env)->DeleteGlobalRef(env, jdropdata);

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

@@ -116,7 +116,6 @@
 (CGDirectDisplayID displayId, CGDisplayChangeSummaryFlags flags, void *userInfo)
 {
 AWT_ASSERT_APPKIT_THREAD;
-JNIEnv *env = [ThreadUtilities getJNIEnv];
 JNI_COCOA_ENTER(env);
 
     if (TRACE_DISPLAY_CALLBACKS) {
@@ -153,6 +152,7 @@
                                                      block:^()
         {
             @try {
+                JNIEnv *env = [ThreadUtilities getJNIEnv];
                 jobject graphicsEnv = (*env)->NewLocalRef(env, cgeRef);
                 if (graphicsEnv == NULL) return; // ref already GC'd
                 DECLARE_CLASS(jc_CGraphicsEnvironment, "sun/awt/CGraphicsEnvironment");
@@ -173,6 +173,7 @@
 
     // braces to reduce variable scope
     {
+        JNIEnv *env = [ThreadUtilities getJNIEnv];
         jobject graphicsEnv = (*env)->NewLocalRef(env, cgeRef);
         if (graphicsEnv == NULL) return; // ref already GC'd
         DECLARE_CLASS(jc_CGraphicsEnvironment, "sun/awt/CGraphicsEnvironment");

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

@@ -223,12 +223,6 @@ void JavaCT_BreakupUnicodeIntoSurrogatePairs(int uniChar, UTF16Char charRef[]) {
 // Using the Quartz Surface Data context, draw a hot-substituted character run
 void JavaCT_DrawTextUsingQSD(JNIEnv *env, const QuartzSDOps *qsdo, const AWTStrike *strike, const jchar *chars, const jsize length)
 {
-    NSAttributedString *attribString = nil;
-    CTTypesetterRef typeSetterRef = NULL;
-    CTLineRef lineRef = NULL;
-
-JNI_COCOA_ENTER(env);
-
     CGContextRef cgRef = qsdo->cgRef;
 
     AWTFont *awtFont = strike->fAWTFont;
@@ -257,18 +251,20 @@ render using the right font (see bug 7183516) when attribString is not
 
     CTTypesetterRef typeSetterRef = CTTypesetterCreateWithAttributedStringAndOptions((CFAttributedStringRef) attribString, (CFDictionaryRef) ctsDictionaryFor(nsFont, JRSFontStyleUsesFractionalMetrics(strike->fStyle)));
     */
-    attribString = [[NSAttributedString alloc]
+    NSAttributedString *attribString = [[NSAttributedString alloc]
         initWithString:string
         attributes:ctsDictionaryFor(nsFont, JRSFontStyleUsesFractionalMetrics(strike->fStyle))];
 
-    typeSetterRef = CTTypesetterCreateWithAttributedString((CFAttributedStringRef) attribString);
+    CTTypesetterRef typeSetterRef = CTTypesetterCreateWithAttributedString((CFAttributedStringRef) attribString);
 
     CFRange range = {0, length};
-    lineRef = CTTypesetterCreateLine(typeSetterRef, range);
+    CTLineRef lineRef = CTTypesetterCreateLine(typeSetterRef, range);
 
     CTLineDraw(lineRef, cgRef);
 
-JNI_COCOA_EXIT_WITH_ACTION(env, ( [attribString release], CFRelease_even_NULL(lineRef), CFRelease_even_NULL(typeSetterRef) ) );
+    [attribString release];
+    CFRelease(lineRef);
+    CFRelease(typeSetterRef);
 }
 
 
@@ -284,16 +280,16 @@ render using the right font (see bug 7183516) when attribString is not
         return;
     }
 
-JNI_COCOA_ENTER(env);
-
     qsdo->BeginSurface(env, qsdo, SD_Text);
     if (qsdo->cgRef == NULL)
     {
+        qsdo->FinishSurface(env, qsdo);
         return;
     }
 
     CGContextRef cgRef = qsdo->cgRef;
 
+
     CGContextSaveGState(cgRef);
     JRSFontSetRenderingStyleOnContext(cgRef, strike->fStyle);
 
@@ -307,7 +303,7 @@ render using the right font (see bug 7183516) when attribString is not
 
     CGContextRestoreGState(cgRef);
 
-JNI_COCOA_RENDERER_EXIT(env);
+    qsdo->FinishSurface(env, qsdo);
 }
 
 #pragma mark --- Glyph Vector Pipeline ---
@@ -532,34 +528,40 @@ render using the right font (see bug 7183516) when attribString is not
         CGSize advances[length];
         doDrawGlyphsPipe_fillGlyphAndAdvanceBuffers(env, qsdo, strike, gVector, glyphs, uniChars, advances, length, glyphsArray);
     }
-    else {
-        CGGlyph *glyphs  = NULL;
-        int *uniChars    = NULL;
-        CGSize *advances = NULL;
-        @try {
-            // otherwise, we should malloc and free buffers for this large run
-            glyphs   = (CGGlyph *)malloc(sizeof(CGGlyph) * length);
-            uniChars = (int *)    malloc(sizeof(int) * length);
-            advances = (CGSize *) malloc(sizeof(CGSize) * length);
+    else
+    {
+        // otherwise, we should malloc and free buffers for this large run
+        CGGlyph *glyphs = (CGGlyph *)malloc(sizeof(CGGlyph) * length);
+        int *uniChars = (int *)malloc(sizeof(int) * length);
+        CGSize *advances = (CGSize *)malloc(sizeof(CGSize) * length);
 
-            if ((glyphs == NULL) || (uniChars == NULL) || (advances == NULL)) {
-                [NSException raise:NSMallocException format:@"allocation failure (%s:%d %s)", __FILE__, __LINE__, __FUNCTION__];
-            } else {
-                doDrawGlyphsPipe_fillGlyphAndAdvanceBuffers(env, qsdo, strike, gVector, glyphs, uniChars, advances, length, glyphsArray);
-            }
-        } @finally {
-            if (glyphs != NULL) {
+        if (glyphs == NULL || uniChars == NULL || advances == NULL)
+        {
+            (*env)->DeleteLocalRef(env, glyphsArray);
+            [NSException raise:NSMallocException format:@"%s-%s:%d", __FILE__, __FUNCTION__, __LINE__];
+            if (glyphs)
+            {
                 free(glyphs);
             }
-            if (uniChars != NULL) {
+            if (uniChars)
+            {
                 free(uniChars);
             }
-            if (advances != NULL) {
+            if (advances)
+            {
                 free(advances);
             }
-            (*env)->DeleteLocalRef(env, glyphsArray);
+            return;
         }
+
+        doDrawGlyphsPipe_fillGlyphAndAdvanceBuffers(env, qsdo, strike, gVector, glyphs, uniChars, advances, length, glyphsArray);
+
+        free(glyphs);
+        free(uniChars);
+        free(advances);
     }
+
+    (*env)->DeleteLocalRef(env, glyphsArray);
 }
 
 // Setup and save the state of the CGContext, and apply any java.awt.Font transforms to the context.