From 56f57e5b36301ac84c1ca5d4eb7fa363f79c81f6 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Wed, 4 Nov 2015 03:11:24 -0800 Subject: [PATCH] Fix object reference comparisons (and remove nil). --- Execute.cpp | 17 +++++- JavaScript.hpp | 11 ++++ ObjectiveC/Library.mm | 123 +++++++++++++++++++++++------------------- 3 files changed, 93 insertions(+), 58 deletions(-) diff --git a/Execute.cpp b/Execute.cpp index 673c8da..522aca4 100644 --- a/Execute.cpp +++ b/Execute.cpp @@ -154,6 +154,7 @@ JSStringRef toCYON_s; JSStringRef toJSON_s; JSStringRef toPointer_s; JSStringRef toString_s; +JSStringRef weak_s; static JSStringRef Result_; @@ -573,7 +574,9 @@ static bool CYGetOffset(CYPool &pool, JSContextRef context, JSStringRef value, s } void *CYCastPointer_(JSContextRef context, JSValueRef value) { - switch (JSValueGetType(context, value)) { + if (value == NULL) + return NULL; + else switch (JSValueGetType(context, value)) { case kJSTypeNull: return NULL; case kJSTypeObject: { @@ -807,8 +810,12 @@ static JSObjectRef CYMakeFunctor(JSContextRef context, JSObjectRef function, con return object; } +JSValueRef CYGetCachedValue(JSContextRef context, JSStringRef name) { + return CYGetProperty(context, CYCastJSObject(context, CYGetProperty(context, CYGetGlobalObject(context), cy_s)), name); +} + JSObjectRef CYGetCachedObject(JSContextRef context, JSStringRef name) { - return CYCastJSObject(context, CYGetProperty(context, CYCastJSObject(context, CYGetProperty(context, CYGetGlobalObject(context), cy_s)), name)); + return CYCastJSObject(context, CYGetCachedValue(context, name)); } static JSObjectRef CYMakeFunctor(JSContextRef context, JSValueRef value, const sig::Signature &signature) { @@ -1691,6 +1698,7 @@ void CYInitializeDynamic() { toJSON_s = JSStringCreateWithUTF8CString("toJSON"); toPointer_s = JSStringCreateWithUTF8CString("toPointer"); toString_s = JSStringCreateWithUTF8CString("toString"); + weak_s = JSStringCreateWithUTF8CString("weak"); Result_ = JSStringCreateWithUTF8CString("_"); @@ -1922,6 +1930,11 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) { //CYSetProperty(context, System, CYJSString("global"), global); CYSetProperty(context, System, CYJSString("print"), &System_print); + if (&JSWeakObjectMapCreate != NULL) { + JSWeakObjectMapRef weak(JSWeakObjectMapCreate(context, NULL, NULL)); + CYSetProperty(context, cy, weak_s, CYCastJSValue(context, reinterpret_cast(weak))); + } + if (CYBridgeEntry *entry = CYBridgeHash("1dlerror", 8)) entry->cache_ = new cy::Functor(entry->value_, reinterpret_cast(&dlerror)); diff --git a/JavaScript.hpp b/JavaScript.hpp index 38b2f60..a94dbb9 100644 --- a/JavaScript.hpp +++ b/JavaScript.hpp @@ -53,6 +53,7 @@ extern JSStringRef toCYON_s; extern JSStringRef toJSON_s; extern JSStringRef toPointer_s; extern JSStringRef toString_s; +extern JSStringRef weak_s; void CYInitializeDynamic(); JSGlobalContextRef CYGetJSContext(); @@ -82,6 +83,7 @@ void CYSetProperty(JSContextRef context, JSObjectRef object, JSStringRef name, J void CYSetPrototype(JSContextRef context, JSObjectRef object, JSValueRef prototype); +JSValueRef CYGetCachedValue(JSContextRef context, JSStringRef name); JSObjectRef CYGetCachedObject(JSContextRef context, JSStringRef name); JSValueRef CYCastJSValue(JSContextRef context, bool value); @@ -203,4 +205,13 @@ class CYJSString { } }; +typedef struct OpaqueJSWeakObjectMap *JSWeakObjectMapRef; +typedef void (*JSWeakMapDestroyedCallback)(JSWeakObjectMapRef map, void *data); + +extern "C" JSWeakObjectMapRef JSWeakObjectMapCreate(JSContextRef ctx, void *data, JSWeakMapDestroyedCallback destructor) __attribute__((__weak_import__)); +extern "C" void JSWeakObjectMapSet(JSContextRef ctx, JSWeakObjectMapRef map, void *key, JSObjectRef) __attribute__((__weak_import__)); +extern "C" JSObjectRef JSWeakObjectMapGet(JSContextRef ctx, JSWeakObjectMapRef map, void *key) __attribute__((__weak_import__)); +extern "C" bool JSWeakObjectMapClear(JSContextRef ctx, JSWeakObjectMapRef map, void *key, JSObjectRef object) __attribute__((__weak_import__)); +extern "C" void JSWeakObjectMapRemove(JSContextRef ctx, JSWeakObjectMapRef map, void* key) __attribute__((__weak_import__)); + #endif/*CYCRIPT_JAVASCRIPT_HPP*/ diff --git a/ObjectiveC/Library.mm b/ObjectiveC/Library.mm index c486fed..16a97e5 100644 --- a/ObjectiveC/Library.mm +++ b/ObjectiveC/Library.mm @@ -425,17 +425,24 @@ struct Message_privateData : } }; -JSObjectRef CYMakeInstance(JSContextRef context, id object, bool permanent) { - Instance::Flags flags; +JSObjectRef CYMakeInstance(JSContextRef context, id object, Instance::Flags flags = Instance::None) { + _assert(object != nil); - if (permanent) - flags = Instance::Permanent; - else { - flags = Instance::None; + JSWeakObjectMapRef weak(CYCastPointer(context, CYGetCachedValue(context, weak_s))); + + if (weak != NULL && &JSWeakObjectMapGet != NULL) + if (JSObjectRef instance = JSWeakObjectMapGet(context, weak, object)) + return instance; + + if ((flags & Instance::Permanent) == 0) object = [object retain]; - } - return Instance::Make(context, object, flags); + JSObjectRef instance(Instance::Make(context, object, flags)); + + if (weak != NULL && &JSWeakObjectMapSet != NULL) + JSWeakObjectMapSet(context, weak, object, instance); + + return instance; } @interface NSMethodSignature (Cycript) @@ -467,42 +474,32 @@ JSObjectRef CYMakeInstance(JSContextRef context, id object, bool permanent) { @end NSString *CYCastNSCYON(id value, bool objective, std::set &objects) { - NSString *string; + _assert(value != nil); + + Class _class(object_getClass(value)); + + if (class_isMetaClass(_class)) { + const char *name(class_getName(value)); + if (class_isMetaClass(value)) + return [NSString stringWithFormat:@"object_getClass(%s)", name]; + else + return [NSString stringWithUTF8String:name]; + } - if (value == nil) - string = @"nil"; - else { - Class _class(object_getClass(value)); - SEL sel(@selector(cy$toCYON:inSet:)); - - if (class_isMetaClass(_class)) { - const char *name(class_getName(value)); - if (class_isMetaClass(value)) - string = [NSString stringWithFormat:@"object_getClass(%s)", name]; - else - string = [NSString stringWithUTF8String:name]; - } else if (objc_method *toCYON = class_getInstanceMethod(_class, sel)) - string = reinterpret_cast &)>(method_getImplementation(toCYON))(value, sel, objective, objects); - else if (objc_method *methodSignatureForSelector = class_getInstanceMethod(_class, @selector(methodSignatureForSelector:))) { - if (reinterpret_cast(method_getImplementation(methodSignatureForSelector))(value, @selector(methodSignatureForSelector:), sel) != nil) - string = [value cy$toCYON:objective inSet:objects]; - else goto fail; - } else fail: { - if (false); #ifdef __APPLE__ - else if (_class == NSZombie_) - string = [NSString stringWithFormat:@"<_NSZombie_: %p>", value]; + if (_class == NSZombie_) + return [NSString stringWithFormat:@"<_NSZombie_: %p>", value]; #endif - else - string = [NSString stringWithFormat:@"%@", value]; - } - // XXX: frowny pants - if (string == nil) - string = @"undefined"; - } + SEL sel(@selector(cy$toCYON:inSet:)); - return string; + if (objc_method *toCYON = class_getInstanceMethod(_class, sel)) + return reinterpret_cast &)>(method_getImplementation(toCYON))(value, sel, objective, objects); + else if (objc_method *methodSignatureForSelector = class_getInstanceMethod(_class, @selector(methodSignatureForSelector:))) + if (reinterpret_cast(method_getImplementation(methodSignatureForSelector))(value, @selector(methodSignatureForSelector:), sel) != nil) + return [value cy$toCYON:objective inSet:objects]; + + return [NSString stringWithFormat:@"%@", value]; } NSString *CYCastNSCYON(id value, bool objective, std::set *objects) { @@ -817,7 +814,7 @@ NSObject *CYCopyNSObject(CYPool &pool, JSContextRef context, JSValueRef value) { [json appendString:@","]; else comma = true; - if (object == nil || [object cy$JSType] != kJSTypeUndefined) + if (object != nil && [object cy$JSType] != kJSTypeUndefined) [json appendString:CYCastNSCYON(object, true, objects)]; else { [json appendString:@","]; @@ -1259,7 +1256,7 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry { if (value == nil) return CYJSNull(context); else - return CYMakeInstance(context, value, false); + return CYMakeInstance(context, value); } CYPoolCatch(NULL) return /*XXX*/ NULL; } @implementation CYJSObject @@ -1567,19 +1564,32 @@ static JSValueRef CYObjectiveC_FromFFI(JSContextRef context, sig::Type *type, ff // XXX: do something epic about blocks case sig::block_P: case sig::object_P: - if (NSObject *object = *reinterpret_cast(data)) { - JSValueRef value(CYCastJSValue(context, object)); - if (initialize) - [object release]; - return value; + if (NSObject *value = *reinterpret_cast(data)) { + JSObjectRef object(CYMakeInstance(context, value)); + + if (initialize) { + Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); + + if ((internal->flags_ & Instance::Uninitialized) != 0) { + internal->flags_ = static_cast(internal->flags_ & ~Instance::Uninitialized); + _assert(internal->value_ == nil); + internal->value_ = value; + } + + [value release]; + } + + return object; } else goto null; case sig::typename_P: - return CYMakeInstance(context, *reinterpret_cast(data), true); + if (Class value = *reinterpret_cast(data)) + return CYMakeInstance(context, value, Instance::Permanent); + else goto null; case sig::selector_P: - if (SEL sel = *reinterpret_cast(data)) - return CYMakeSelector(context, sel); + if (SEL value = *reinterpret_cast(data)) + return CYMakeSelector(context, value); else goto null; null: @@ -1956,7 +1966,7 @@ static void Instance_getPropertyNames(JSContextRef context, JSObjectRef object, static JSObjectRef Instance_callAsConstructor(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); - JSObjectRef value(Instance::Make(context, [internal->GetValue() alloc], Instance::Uninitialized)); + JSObjectRef value(CYMakeInstance(context, [internal->GetValue() alloc], Instance::Uninitialized)); return value; } CYCatch(NULL) } @@ -2165,7 +2175,7 @@ static JSValueRef ObjectiveC_Classes_getProperty(JSContextRef context, JSObjectR CYPool pool; NSString *name(CYCastNSString(&pool, context, property)); if (Class _class = NSClassFromString(name)) - return CYMakeInstance(context, _class, true); + return CYMakeInstance(context, _class, Instance::Permanent); return NULL; } CYCatch(NULL) } @@ -2220,7 +2230,7 @@ static JSValueRef ObjectiveC_Image_Classes_getProperty(JSContextRef context, JSO for (size_t i(0); i != size; ++i) if (strcmp(name, data[i]) == 0) { if (Class _class = objc_getClass(name)) { - value = CYMakeInstance(context, _class, true); + value = CYMakeInstance(context, _class, Instance::Permanent); goto free; } else break; @@ -2273,7 +2283,7 @@ static JSValueRef ObjectiveC_Protocols_getProperty(JSContextRef context, JSObjec CYPool pool; const char *name(CYPoolCString(pool, context, property)); if (Protocol *protocol = objc_getProtocol(name)) - return CYMakeInstance(context, protocol, true); + return CYMakeInstance(context, protocol, Instance::Permanent); return NULL; } CYCatch(NULL) } @@ -2293,7 +2303,7 @@ static JSValueRef ObjectiveC_Constants_getProperty(JSContextRef context, JSObjec CYPool pool; CYUTF8String name(CYPoolUTF8String(pool, context, property)); if (name == "nil") - return Instance::Make(context, nil); + return CYJSNull(context); return NULL; } CYCatch(NULL) } @@ -2579,7 +2589,7 @@ static JSObjectRef Instance_new(JSContextRef context, JSObjectRef object, size_t if (count > 1) throw CYJSError(context, "incorrect number of arguments to Instance constructor"); id self(count == 0 ? nil : CYCastPointer(context, arguments[0])); - return CYMakeInstance(context, self, false); + return CYMakeInstance(context, self); } CYCatch(NULL) } static JSValueRef CYValue_getProperty_value(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { @@ -2619,7 +2629,7 @@ static JSValueRef FunctionInstance_getProperty_type(JSContextRef context, JSObje static JSValueRef Instance_getProperty_constructor(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); - return Instance::Make(context, (id) object_getClass(internal->GetValue())); + return CYMakeInstance(context, object_getClass(internal->GetValue()), Instance::Permanent); } CYCatch(NULL) } static JSValueRef Instance_getProperty_prototype(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { @@ -2677,6 +2687,7 @@ static JSValueRef Instance_callAsFunction_valueOf(JSContextRef context, JSObject Instance *internal(reinterpret_cast(JSObjectGetPrivate(_this))); id value(internal->GetValue()); + _assert(value != nil); if (![value respondsToSelector:@selector(cy$valueOfInContext:)]) return _this; -- 2.49.0