corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 459266 - TM: Allow CALLINFO macros to specify linkage. r=brendan.

Browse Source
This commit is contained in:
Jason Orendorff
2008-10-16 14:24:10 -05:00
parent 3f46eaf8d3
commit 3584746574
11 changed files with 286 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
js/src/jsobj.cpp
View File

@@ -1557,8 +1557,8 @@ js_HasOwnProperty(JSContext *cx, JSLookupPropOp lookup, JSObject *obj, jsid id,
}
#ifdef JS_TRACER
int32 FASTCALL
js_Object_p_hasOwnProperty(JSContext* cx, JSObject* obj, JSString *str)
static int32 FASTCALL
Object_p_hasOwnProperty(JSContext* cx, JSObject* obj, JSString *str)
{
jsid id = ATOM_TO_JSID(STRING_TO_JSVAL(str));
jsval v;
@@ -1598,8 +1598,8 @@ obj_propertyIsEnumerable(JSContext *cx, uintN argc, jsval *vp)
}
#ifdef JS_TRACER
int32 FASTCALL
js_Object_p_propertyIsEnumerable(JSContext* cx, JSObject* obj, JSString *str)
static int32 FASTCALL
Object_p_propertyIsEnumerable(JSContext* cx, JSObject* obj, JSString *str)
{
jsid id = ATOM_TO_JSID(STRING_TO_JSVAL(str));
jsval v;
@@ -1811,14 +1811,14 @@ const char js_lookupSetter_str[] = "__lookupSetter__";
#ifdef JS_TRACER
JS_DEFINE_CALLINFO_3(INT32, Object_p_hasOwnProperty, CONTEXT, OBJECT, STRING, 0, 0)
JS_DEFINE_CALLINFO_3(INT32, Object_p_propertyIsEnumerable, CONTEXT, OBJECT, STRING, 0, 0)
JS_DEFINE_CALLINFO_3(static, INT32, Object_p_hasOwnProperty, CONTEXT, OBJECT, STRING, 0, 0)
JS_DEFINE_CALLINFO_3(static, INT32, Object_p_propertyIsEnumerable, CONTEXT, OBJECT, STRING, 0, 0)
static const JSTraceableNative obj_hasOwnProperty_trcinfo[] = {
{ obj_hasOwnProperty, &ci_Object_p_hasOwnProperty, "TC", "s", FAIL_VOID }
{ obj_hasOwnProperty, &_JS_CALLINFO(Object_p_hasOwnProperty), "TC", "s", FAIL_VOID }
};
static const JSTraceableNative obj_propertyIsEnumerable_trcinfo[] = {
{ obj_propertyIsEnumerable, &ci_Object_p_propertyIsEnumerable, "TC", "s", FAIL_VOID }
{ obj_propertyIsEnumerable, &_JS_CALLINFO(Object_p_propertyIsEnumerable), "TC", "s", FAIL_VOID }
};
#endif /* JS_TRACER */