Workaround for apparent clang bug calculating ivar offset into NSThre…

…ad object.
keysight-eggplant · Nov 1, 2024 · 0d487c5 · 0d487c5
1 parent e9ab3d8
commit 0d487c5
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/Source/NSGraphicsContext.m b/Source/NSGraphicsContext.m
@@ -33,7 +33,9 @@
    Boston, MA 02110-1301, USA.
 */
 
+#if     !defined(_NONFRAGILE_ABI)
 #define EXPOSE_NSThread_IVARS
+#endif
 
 #import <Foundation/NSGeometry.h> 
 #import <Foundation/NSString.h> 
@@ -102,7 +104,12 @@
  */
   NSThread *th = GSCurrentThread();
 
+# if     defined(_NONFRAGILE_ABI)
+  return (NSGraphicsContext*)object_getIvar(th,
+    class_getInstanceVariable(object_getClass(th), "_gcontext"));
+# else
   return (NSGraphicsContext*) th->_gcontext;
+# endif
 #else
   NSMutableDictionary *dict = [[NSThread currentThread] threadDictionary];
 
@@ -171,7 +178,12 @@ + (void) setCurrentContext: (NSGraphicsContext *)context
  */
   NSThread *th = GSCurrentThread();
 
+# if     defined(_NONFRAGILE_ABI)
+  object_setIvar(th,
+    class_getInstanceVariable(object_getClass(th), "_gcontext"), context);
+# else
   ASSIGN(th->_gcontext, context);
+# endif
 #else
   NSMutableDictionary *dict = [[NSThread currentThread] threadDictionary];