From d13351518b063600be769b518c58f0d494a08c00 Mon Sep 17 00:00:00 2001 From: Shu-yu Guo Date: Fri, 11 Mar 2016 21:43:20 -0800 Subject: [PATCH] Bug 1254893 - Prep Debugger.Script for a tagged union referent. (r=jimb) --- js/src/vm/Debugger.cpp | 87 +++++++++++++++++++++++++++++++++++------- 1 file changed, 74 insertions(+), 13 deletions(-) diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp index d2458ac9a975..bd2956444dec 100644 --- a/js/src/vm/Debugger.cpp +++ b/js/src/vm/Debugger.cpp @@ -19,14 +19,17 @@ #include "jsprf.h" #include "jswrapper.h" +#include "asmjs/WasmModule.h" #include "frontend/BytecodeCompiler.h" #include "frontend/Parser.h" #include "gc/Marking.h" +#include "gc/Policy.h" #include "jit/BaselineDebugModeOSR.h" #include "jit/BaselineJIT.h" #include "jit/JSONSpewer.h" #include "jit/MIRGraph.h" #include "js/GCAPI.h" +#include "js/GCVariant.h" #include "js/UbiNodeBreadthFirst.h" #include "js/Vector.h" #include "vm/ArgumentsObject.h" @@ -52,6 +55,8 @@ using mozilla::ArrayLength; using mozilla::DebugOnly; using mozilla::MakeScopeExit; using mozilla::Maybe; +using mozilla::Variant; +using mozilla::AsVariant; /*** Forward declarations ************************************************************************/ @@ -2668,6 +2673,7 @@ Debugger::markCrossCompartmentEdges(JSTracer* trc) environments.markCrossCompartmentEdges(trc); scripts.markCrossCompartmentEdges(trc); sources.markCrossCompartmentEdges(trc); + wasmModuleScripts.markCrossCompartmentEdges(trc); } /* @@ -2902,7 +2908,8 @@ Debugger::findZoneEdges(Zone* zone, js::gc::ComponentFinder& finder) dbg->scripts.hasKeyInZone(zone) || dbg->sources.hasKeyInZone(zone) || dbg->objects.hasKeyInZone(zone) || - dbg->environments.hasKeyInZone(zone)) + dbg->environments.hasKeyInZone(zone) || + dbg->wasmModuleScripts.hasKeyInZone(zone)) { finder.addEdgeTo(w); } @@ -4897,20 +4904,54 @@ const JSFunctionSpec Debugger::static_methods[] { /*** Debugger.Script *****************************************************************************/ -static inline JSScript* +// Either a real JSScript or synthesized. +// +// If synthesized, the NativeObject is one of the following: +// +// 1. A WasmModuleObject, denoting a synthesized toplevel wasm module +// script. +// 2. A wasm JSFunction, denoting a synthesized wasm function script. +// NYI! +using DebuggerScriptReferent = Variant; + +// Get the Debugger.Script referent as bare Cell. This should only be used for +// GC operations like tracing. Please use GetScriptReferent below. +static inline gc::Cell* +GetScriptReferentCell(JSObject* obj) +{ + MOZ_ASSERT(obj->getClass() == &DebuggerScript_class); + return static_cast(obj->as().getPrivate()); +} + +static inline DebuggerScriptReferent GetScriptReferent(JSObject* obj) { MOZ_ASSERT(obj->getClass() == &DebuggerScript_class); - return static_cast(obj->as().getPrivate()); + if (gc::Cell* cell = GetScriptReferentCell(obj)) { + if (cell->getTraceKind() == JS::TraceKind::Script) + return AsVariant(static_cast(cell)); + MOZ_ASSERT(cell->getTraceKind() == JS::TraceKind::Object); + return AsVariant(&static_cast(cell)->as()); + } + return AsVariant(static_cast(nullptr)); } void DebuggerScript_trace(JSTracer* trc, JSObject* obj) { /* This comes from a private pointer, so no barrier needed. */ - if (JSScript* script = GetScriptReferent(obj)) { - TraceManuallyBarrieredCrossCompartmentEdge(trc, obj, &script, "Debugger.Script referent"); - obj->as().setPrivateUnbarriered(script); + DebuggerScriptReferent referent = GetScriptReferent(obj); + if (referent.is()) { + if (JSScript* script = referent.as()) { + TraceManuallyBarrieredCrossCompartmentEdge(trc, obj, &script, + "Debugger.Script script referent"); + obj->as().setPrivateUnbarriered(script); + } + } else { + JSObject* wasm = referent.as(); + TraceManuallyBarrieredCrossCompartmentEdge(trc, obj, &wasm, + "Debugger.Script wasm referent"); + obj->as().setPrivateUnbarriered(wasm); } } @@ -4965,7 +5006,7 @@ Debugger::wrapScript(JSContext* cx, HandleScript script) } } - MOZ_ASSERT(GetScriptReferent(p->value()) == script); + MOZ_ASSERT(GetScriptReferent(p->value()).as() == script); return p->value(); } @@ -4985,8 +5026,7 @@ DebuggerScript_check(JSContext* cx, const Value& v, const char* clsname, const c * Check for Debugger.Script.prototype, which is of class DebuggerScript_class * but whose script is null. */ - if (!GetScriptReferent(thisobj)) { - MOZ_ASSERT(!GetScriptReferent(thisobj)); + if (!GetScriptReferentCell(thisobj)) { JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO, clsname, fnname, "prototype object"); return nullptr; @@ -4995,18 +5035,39 @@ DebuggerScript_check(JSContext* cx, const Value& v, const char* clsname, const c return thisobj; } +template static JSObject* -DebuggerScript_checkThis(JSContext* cx, const CallArgs& args, const char* fnname) +DebuggerScript_checkThis(JSContext* cx, const CallArgs& args, const char* fnname, + const char* refname) { - return DebuggerScript_check(cx, args.thisv(), "Debugger.Script", fnname); + JSObject* thisobj = DebuggerScript_check(cx, args.thisv(), "Debugger.Script", fnname); + if (!thisobj) + return nullptr; + + if (!GetScriptReferent(thisobj).is()) { + ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_DEBUG_BAD_REFERENT, + JSDVG_SEARCH_STACK, args.thisv(), nullptr, + refname, nullptr); + return nullptr; + } + + return thisobj; } +#define THIS_DEBUGSCRIPT_REFERENT(cx, argc, vp, fnname, args, obj, referent) \ + CallArgs args = CallArgsFromVp(argc, vp); \ + RootedObject obj(cx, DebuggerScript_check(cx, args.thisv(), fnname)); \ + if (!obj) \ + return false; \ + Rooted referent(cx, GetScriptReferent(obj)) + #define THIS_DEBUGSCRIPT_SCRIPT(cx, argc, vp, fnname, args, obj, script) \ CallArgs args = CallArgsFromVp(argc, vp); \ - RootedObject obj(cx, DebuggerScript_checkThis(cx, args, fnname)); \ + RootedObject obj(cx, DebuggerScript_checkThis(cx, args, fnname, \ + "a JS script")); \ if (!obj) \ return false; \ - Rooted script(cx, GetScriptReferent(obj)) + RootedScript script(cx, GetScriptReferent(obj).as()) static bool DebuggerScript_getDisplayName(JSContext* cx, unsigned argc, Value* vp)