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

Merge.

Browse Source
This commit is contained in:
Brendan Eich
2008-08-08 16:40:45 -07:00
parent bb579d08c8 84a8dc97f7
commit 77350abfea
5 changed files with 59 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
js/src/jsbuiltins.cpp
View File

@@ -304,20 +304,13 @@ builtin_CloseIterator(JSContext* cx, jsval v)
}
GuardRecord* FASTCALL
builtin_CallTree(InterpState* outer, Fragment* f)
builtin_CallTree(InterpState* state, Fragment* f)
{
/* current we can't deal with inner trees that have globals so report an error */
if (((TreeInfo*)f->vmprivate)->globalSlots.length())
return NULL;
InterpState state;
state.ip = f->ip;
state.sp = outer->sp;
state.rp = outer->rp;
state.gp = outer->gp;
state.cx = outer->cx;
JS_ASSERT(!((TreeInfo*)f->vmprivate)->globalSlots.length());
union { NIns *code; GuardRecord* (FASTCALL *func)(InterpState*, Fragment*); } u;
u.code = f->code();
return u.func(&state, NULL);
return u.func(state, NULL);
}
JSObject* FASTCALL