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

[JAEGER] Merge from fatval branch.

Browse Source
This commit is contained in:
David Anderson
2010-06-10 21:58:13 -07:00
parent 86d93f4f14 dff69d06b2
commit fb0f152919
29 changed files with 1484 additions and 1569 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/src/jsapi.cpp
View File

@@ -1645,7 +1645,7 @@ JS_GetGlobalForScopeChain(JSContext *cx)
VOUCH_DOES_NOT_REQUIRE_STACK();
if (cx->fp)
return cx->fp->scopeChain->getGlobal();
return cx->fp->scopeChainObj()->getGlobal();
JSObject *scope = cx->globalObject;
if (!scope) {
@@ -4003,7 +4003,7 @@ js_generic_fast_native_method_dispatcher(JSContext *cx, uintN argc, Value *vp)
native =
#ifdef JS_TRACER
(fs->flags & JSFUN_TRCINFO)
? JS_FUNC_TO_DATA_PTR(JSNativeTraceInfo *, fs->call)->native
? (FastNative) JS_FUNC_TO_DATA_PTR(JSNativeTraceInfo *, fs->call)->native
:
#endif
(FastNative) fs->call;