darlinghq/darling-libobjc2
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-libobjc2.git synced 2025-02-25 11:10:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reverted last commit - breaks the build with clang.

Browse Source 
Fixed the definition of objc_msgSendSuper().

Tweaked the -dealloc implementation for hidden classes used for locking so that @synchronize(self) will work in a -dealloc method.
This commit is contained in:
theraven 2010-05-20 10:56:56 +00:00
parent 2efec09e39
commit a9bdab1f44
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
objc/runtime.h
View File

@ -327,6 +327,6 @@ static const id self = nil;
objc_msg_lookup_sender(&__receiver, op, self)(__receiver, op, ## __VA_ARGS__);\
})
#define objc_msgSendSuper(super, op, ...) objc_msg_lookup_super(super, op)(super->receiver, op, ## __VA_ARGS__)
#define objc_msgSendSuper(super, op, ...) objc_msg_lookup_super(super, op)((super)->receiver, op, ## __VA_ARGS__)
#endif // __LIBOBJC_RUNTIME_H_INCLUDED__

13
sync.m
View File

@ -25,7 +25,7 @@ static void deallocLockClass(id obj, SEL _cmd);
static inline Class findLockClass(id obj)
{
struct objc_object object = { obj->isa };
SEL dealloc = (SEL)@selector(dealloc);
SEL dealloc = @selector(dealloc);
// Find the first class where this lookup is correct
if (objc_msg_lookup((id)&object, dealloc) != (IMP)deallocLockClass)
{
@ -62,8 +62,8 @@ static inline Class initLockObject(id obj)
}
const char *types =
method_getTypeEncoding(class_getInstanceMethod(obj->isa,
(SEL)@selector(dealloc)));
class_addMethod(lockClass, (SEL)@selector(dealloc), (IMP)deallocLockClass,
@selector(dealloc)));
class_addMethod(lockClass, @selector(dealloc), (IMP)deallocLockClass,
types);
if (!class_isMetaClass(obj->isa))
{
@ -81,14 +81,15 @@ static void deallocLockClass(id obj, SEL _cmd)
{
Class lockClass = findLockClass(obj);
Class realClass = class_getSuperclass(lockClass);
// Call the real -dealloc method
struct objc_super super = {obj, realClass };
objc_msgSendSuper(&super, @selector(dealloc));
// After calling [super dealloc], the object will no longer exist.
// Free the lock
mutex_t *lock = object_getIndexedIvars(lockClass);
DESTROY_LOCK(lock);
// Free the class
objc_disposeClassPair(lockClass);
// Reset the class then call the real -dealloc
obj->isa = realClass;
[obj dealloc];
}
// TODO: This should probably have a special case for classes conforming to the