wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Adjust compartment assertions in the new implementations of jsdbgapi.h Trap entry points. Some are tightened up, but JS_ClearScriptTraps no longer asserts, as that caused a test to fail in debug builds.

Browse Source
This commit is contained in:
Jason Orendorff 2011-06-29 10:16:55 -05:00
parent ada69f18d9
commit 6520ac2269
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/src/jsdbgapi.cpp
View File

@ -210,8 +210,9 @@ JS_SetSingleStepMode(JSContext *cx, JSScript *script, JSBool singleStep)
jsbytecode *
js_UntrapScriptCode(JSContext *cx, JSScript *script)
{
jsbytecode *code = script->code;
assertSameCompartment(cx, script);
jsbytecode *code = script->code;
BreakpointSiteMap &sites = script->compartment->breakpointSites;
for (BreakpointSiteMap::Range r = sites.all(); !r.empty(); r.popFront()) {
BreakpointSite *site = r.front().value;
@ -261,6 +262,8 @@ JS_PUBLIC_API(void)
JS_ClearTrap(JSContext *cx, JSScript *script, jsbytecode *pc,
JSTrapHandler *handlerp, jsval *closurep)
{
assertSameCompartment(cx, script);
if (BreakpointSite *site = script->compartment->getBreakpointSite(pc)) {
site->clearTrap(cx, NULL, handlerp, Valueify(closurep));
} else {
@ -274,7 +277,12 @@ JS_ClearTrap(JSContext *cx, JSScript *script, jsbytecode *pc,
JS_PUBLIC_API(void)
JS_ClearScriptTraps(JSContext *cx, JSScript *script)
{
assertSameCompartment(cx, script);
/*
* No assertSameCompartment here, because this can be called during
* GC. Rather than require the caller to figure out whether GC is going on
* and conditionally enter a cross-compartment call, we simply omit the
* assertion.
*/
script->compartment->clearTraps(cx, script);
}