gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 00:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

tiny fix for swizzling

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@37978 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2014-07-04 11:10:08 +00:00
parent 855fe39f38
commit 7d08f54219
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Source/Additions/GSObjCRuntime.m
View file

@ -2104,9 +2104,14 @@ GSClassSwizzle(id instance, Class newClass)
{
Class oldClass = object_getClass(instance);
/* Only set if the old and new class differ
*/
if (oldClass != newClass)
{
#if defined(GNUSTEP_BASE_LIBRARY)
/* NB. The call to object_setClass() may not work (eg for a libobjc2
* 'small object', in which case the class is unchanged and we need
* to allow for that.
*/
# if GS_WITH_GC
/* We only do allocation counting for objects that can be
* finalised - for other objects we have no way of decrementing
@ -2118,22 +2123,26 @@ GSClassSwizzle(id instance, Class newClass)
* accounting.
*/
AREM(oldClass, instance);
AADD(newClass, instance);
}
else if (GSIsFinalizable(newClass))
}
object_setClass(instance, newClass);
newClass = object_getClass(instance);
if (GSIsFinalizable(newClass))
{
/* New class is finalizable, so we must register the instance
* for finalisation and do allocation acounting for it.
*/
AADD(newClass, instance);
GC_REGISTER_FINALIZER (instance, GSFinalize, NULL, NULL, NULL);
if (NO == GSIsFinalizable(oldClass))
{
GC_REGISTER_FINALIZER (instance, GSFinalize, NULL, NULL, NULL);
}
}
# else
AREM(oldClass, instance);
object_setClass(instance, newClass);
newClass = object_getClass(instance);
AADD(newClass, instance);
# endif /* GS_WITH_GC */
#endif /* defined(GNUSTEP_BASE_LIBRARY) */
object_setClass(instance, newClass);
}
}