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

bug 446386 - eliminating compiler pseudo-frames. r=brendan

Browse Source
This commit is contained in:
Igor Bukanov
2008-09-08 11:47:12 +02:00
parent b9610f42ce
commit a7c6d07217
14 changed files with 170 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
js/src/jsobj.cpp
View File

@@ -1179,6 +1179,7 @@ js_obj_eval(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
const char *file;
uintN line;
JSPrincipals *principals;
uint32 tcflags;
JSScript *script;
JSBool ok;
#if JS_HAS_EVAL_THIS_SCOPE
@@ -1309,21 +1310,10 @@ js_obj_eval(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
principals = NULL;
}
/*
* Set JSFRAME_EVAL on fp and any frames (e.g., fun_call if eval.call was
* invoked) between fp and its scripted caller, to help the compiler easily
* find the same caller whose scope and var obj we've set.
*
* XXX this nonsense could, and perhaps should, go away with a better way
* to pass params to the compiler than via the top-most frame.
*/
do {
fp->flags |= JSFRAME_EVAL;
} while ((fp = fp->down) != caller);
script = js_CompileScript(cx, scopeobj, principals,
TCF_COMPILE_N_GO |
TCF_PUT_STATIC_DEPTH(caller->script->staticDepth + 1),
tcflags = TCF_COMPILE_N_GO;
if (caller)
tcflags |= TCF_PUT_STATIC_DEPTH(caller->script->staticDepth + 1);
script = js_CompileScript(cx, scopeobj, caller, principals, tcflags,
JSSTRING_CHARS(str), JSSTRING_LENGTH(str),
NULL, file, line);
if (!script) {