Restore 'CALLEE' tracable native type, quickstubs need it (compilation fix for bug 512617).

This commit is contained in:
Andreas Gal 2009-08-29 13:05:16 -07:00
parent 64328a8e94
commit 8b20919625
2 changed files with 4 additions and 0 deletions

View File

@ -181,6 +181,7 @@ class ClosureVarInfo;
#define _JS_CTYPE_THIS _JS_CTYPE(JSObject *, _JS_PTR,"T", "", INFALLIBLE) #define _JS_CTYPE_THIS _JS_CTYPE(JSObject *, _JS_PTR,"T", "", INFALLIBLE)
#define _JS_CTYPE_THIS_DOUBLE _JS_CTYPE(jsdouble, _JS_F64,"D", "", INFALLIBLE) #define _JS_CTYPE_THIS_DOUBLE _JS_CTYPE(jsdouble, _JS_F64,"D", "", INFALLIBLE)
#define _JS_CTYPE_THIS_STRING _JS_CTYPE(JSString *, _JS_PTR,"S", "", INFALLIBLE) #define _JS_CTYPE_THIS_STRING _JS_CTYPE(JSString *, _JS_PTR,"S", "", INFALLIBLE)
#define _JS_CTYPE_CALLEE _JS_CTYPE(JSObject *, _JS_PTR,"f","", INFALLIBLE)
#define _JS_CTYPE_FUNCTION _JS_CTYPE(JSFunction *, _JS_PTR, --, --, INFALLIBLE) #define _JS_CTYPE_FUNCTION _JS_CTYPE(JSFunction *, _JS_PTR, --, --, INFALLIBLE)
#define _JS_CTYPE_PC _JS_CTYPE(jsbytecode *, _JS_PTR,"P", "", INFALLIBLE) #define _JS_CTYPE_PC _JS_CTYPE(jsbytecode *, _JS_PTR,"P", "", INFALLIBLE)
#define _JS_CTYPE_JSVALPTR _JS_CTYPE(jsval *, _JS_PTR, --, --, INFALLIBLE) #define _JS_CTYPE_JSVALPTR _JS_CTYPE(jsval *, _JS_PTR, --, --, INFALLIBLE)

View File

@ -9502,6 +9502,9 @@ TraceRecorder::callTraceableNative(JSFunction* fun, uintN argc, bool constructin
} else if (argtype == 's') { } else if (argtype == 's') {
if (!JSVAL_IS_STRING(arg)) if (!JSVAL_IS_STRING(arg))
goto next_specialization; goto next_specialization;
} else if (argtype == 'f') {
if (!VALUE_IS_FUNCTION(cx, arg))
goto next_specialization;
} else if (argtype == 'v') { } else if (argtype == 'v') {
*argp = box_jsval(arg, *argp); *argp = box_jsval(arg, *argp);
} else { } else {