Changeset 157978 in webkit

Timestamp:

Oct 24, 2013, 6:34:56 PM (13 years ago)

Author:

Lucas Forschler

Message:

Merged r154655. <rdar://problem/15109412>

Location:

branches/safari-537.73-branch/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/ObjcRuntimeExtras.h (modified) (1 diff)

branches/safari-537.73-branch/Source/WTF/ChangeLog

@@ +1 @@
+2013-10-24  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r154655
+
+    2013-08-26  Andy Estes  <aestes@apple.com>
+
+            Don't leak objects in HardAutorelease when OBJC_NO_GC is undefined but
+            Objective-C GC is disabled at runtime.
+
+            Reviewed by Darin Adler.
+
+            * wtf/ObjcRuntimeExtras.h:
+            (HardAutorelease):
+
 2013-10-24  Lucas Forschler  <lforschler@apple.com>
 

branches/safari-537.73-branch/Source/WTF/wtf/ObjcRuntimeExtras.h

@@ -52 +52 @@
     if (object)
         CFMakeCollectable(object);
-#elif !__has_feature(objc_arc)
+#endif
+#if !__has_feature(objc_arc)
     [(id)object autorelease];
 #endif