gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make object allocation and deallocation use the runtime.

Browse source 
All objects are now created and destroyed by the runtime, so we have
clean layering between -base and libobjc.
This commit is contained in:
David Chisnall 2017-12-13 18:22:08 +00:00
parent c3921ee1f7
commit e35eb61dbc
2 changed files with 40 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
Source/NSObject.m
View file

@ -125,6 +125,7 @@ BOOL NSDeallocateZombies = NO;
static Class zombieClass = Nil;
static NSMapTable *zombieMap = 0;
#ifndef OBJC_CAP_ARC
static void GSMakeZombie(NSObject *o, Class c)
{
object_setClass(o, zombieClass);
@ -135,6 +136,7 @@ static void GSMakeZombie(NSObject *o, Class c)
[allocationLock unlock];
}
}
#endif
static void GSLogZombie(id o, SEL sel)
{
@ -635,6 +637,8 @@ NSIncrementExtraRefCount(id anObject)
#define AREM(c, o)
#endif
#ifndef OBJC_CAP_ARC
static SEL cxx_construct, cxx_destruct;
/**
@ -668,6 +672,7 @@ callCXXConstructors(Class aClass, id anObject)
}
return constructor;
}
#endif
/*
@ -681,6 +686,9 @@ callCXXConstructors(Class aClass, id anObject)
inline id
NSAllocateObject (Class aClass, NSUInteger extraBytes, NSZone *zone)
{
#ifdef OBJC_CAP_ARC
return class_createInstance(aClass, extraBytes);
#else
id new;
int size;
@ -713,17 +721,21 @@ NSAllocateObject (Class aClass, NSUInteger extraBytes, NSZone *zone)
callCXXConstructors(aClass, new);
return new;
#endif
}
inline void
NSDeallocateObject(id anObject)
{
Class aClass = object_getClass(anObject);
if ((anObject != nil) && !class_isMetaClass(aClass))
{
#ifndef OBJC_CAP_ARC
obj o = &((obj)anObject)[-1];
NSZone *z = NSZoneFromPointer(o);
#endif
/* Call the default finalizer to handle C++ destructors.
*/
@ -732,16 +744,37 @@ NSDeallocateObject(id anObject)
AREM(aClass, (id)anObject);
if (NSZombieEnabled == YES)
{
#ifdef OBJC_CAP_ARC
if (0 != zombieMap)
{
[allocationLock lock];
NSMapInsert(zombieMap, (void*)anObject, (void*)aClass);
[allocationLock unlock];
}
if (NSDeallocateZombies == YES)
{
object_dispose(anObject);
}
else
{
object_setClass(anObject, zombieClass);
}
#else
GSMakeZombie(anObject, aClass);
if (NSDeallocateZombies == YES)
{
NSZoneFree(z, o);
}
#endif
}
else
{
#ifdef OBJC_CAP_ARC
object_dispose(anObject);
#else
object_setClass((id)anObject, (Class)(void*)0xdeadface);
NSZoneFree(z, o);
#endif
}
}
return;
@ -1236,6 +1269,7 @@ static id gs_weak_load(id obj)
- (void) finalize
{
#ifndef OBJC_CAP_ARC
Class destructorClass = Nil;
IMP destructor = 0;
/*
@ -1290,6 +1324,7 @@ static id gs_weak_load(id obj)
}
}
return;
#endif
}
/**

5
Tests/base/NSProxy/basic.m
View file

@ -1,6 +1,9 @@
#import "ObjectTesting.h"
#import <Foundation/NSAutoreleasePool.h>
#import <Foundation/NSProxy.h>
#if __has_include(<objc/capabilities.h>
#include <objc/capabilities.h>
#endif
int main()
{
@ -24,8 +27,10 @@ int main()
obj1 = [NSProxy allocWithZone:testZone];
PASS(obj1 != nil, "%s has working allocWithZone:",prefix);
#ifndef OBJC_CAP_ARC
PASS(NSZoneFromPointer(obj1) == testZone, "%s uses zone for alloc",prefix);
PASS([obj1 zone] == testZone, "%s -zone works",prefix);
#endif
PASS([obj1 hash] != 0, "%s has working -hash",prefix);
PASS([obj1 isEqual:obj1] == YES, "%s has working -isEqual:",prefix);