Backed out changeset ce34c13388f2 (bug 1007383) for crashtest failures.

js/public/OldDebugAPI.h

@@ -24,8 +24,7 @@ class JSFreeOp;
 
 namespace js {
 class InterpreterFrame;
-class FrameIter;
-class ScriptSource;
+class ScriptFrameIter;
 }
 
 // Raw JSScript* because this needs to be callable from a signal handler.
@@ -40,20 +39,18 @@ namespace JS {
 class FrameDescription
 {
   public:
-    explicit FrameDescription(const js::FrameIter& iter);
-    FrameDescription(const FrameDescription &rhs);
-    ~FrameDescription();
+    explicit FrameDescription(const js::ScriptFrameIter& iter);
 
     unsigned lineno() {
-        if (!linenoComputed_) {
+        if (!linenoComputed) {
             lineno_ = JS_PCToLineNumber(nullptr, script_, pc_);
-            linenoComputed_ = true;
+            linenoComputed = true;
         }
         return lineno_;
     }
 
     const char *filename() const {
-        return filename_;
+        return JS_GetScriptFilename(script_);
     }
 
     JSFlatString *funDisplayName() const {
@@ -70,22 +67,11 @@ class FrameDescription
     }
 
   private:
-    void operator=(const FrameDescription &) MOZ_DELETE;
-
-    // These fields are always initialized:
-    Heap<JSString*> funDisplayName_;
-    const char *filename_;
-
-    // One of script_ xor scriptSource_ is non-null.
     Heap<JSScript*> script_;
-    js::ScriptSource *scriptSource_;
-
-    // For script_-having frames, lineno_ is lazily computed as an optimization.
-    bool linenoComputed_;
-    unsigned lineno_;
-
-    // pc_ is non-null iff script_ is non-null. If !pc_, linenoComputed_ = true.
+    Heap<JSString*> funDisplayName_;
     jsbytecode *pc_;
+    unsigned lineno_;
+    bool linenoComputed;
 };
 
 struct StackDescription

js/src/vm/OldDebugAPI.cpp

@@ -897,45 +897,14 @@ js_CallContextDebugHandler(JSContext *cx)
  * constructing a FrameDescription on the stack just to append it to a vector.
  * FrameDescription contains Heap<T> fields that should not live on the stack.
  */
-JS::FrameDescription::FrameDescription(const FrameIter& iter)
-  : scriptSource_(nullptr),
-    linenoComputed_(false),
-    pc_(nullptr)
+JS::FrameDescription::FrameDescription(const ScriptFrameIter& iter)
+  : script_(iter.script()),
+    funDisplayName_(nullptr),
+    pc_(iter.pc()),
+    linenoComputed(false)
 {
-    if (iter.isFunctionFrame())
-        funDisplayName_ = iter.functionDisplayAtom();
-
-    if (iter.hasScript()) {
-        script_ = iter.script();
-        pc_ = iter.pc();
-        filename_ = script_->filename();
-    } else {
-        scriptSource_ = iter.scriptSource();
-        scriptSource_->incref();
-        filename_ = scriptSource_->filename();
-        lineno_ = iter.computeLine();
-        linenoComputed_ = true;
-    }
-}
-
-JS::FrameDescription::FrameDescription(const FrameDescription &rhs)
-  : funDisplayName_(rhs.funDisplayName_),
-    filename_(rhs.filename_),
-    script_(rhs.script_),
-    scriptSource_(rhs.scriptSource_),
-    linenoComputed_(rhs.linenoComputed_),
-    lineno_(rhs.lineno_),
-    pc_(rhs.pc_)
-{
-    if (scriptSource_)
-        scriptSource_->incref();
-}
-
-
-JS::FrameDescription::~FrameDescription()
-{
-    if (scriptSource_)
-        scriptSource_->decref();
+    if (JSFunction *fun = iter.maybeCallee())
+        funDisplayName_ = fun->displayAtom();
 }
 
 JS_PUBLIC_API(JS::StackDescription *)
@@ -943,9 +912,9 @@ JS::DescribeStack(JSContext *cx, unsigned maxFrames)
 {
     Vector<FrameDescription> frames(cx);
 
-    NonBuiltinFrameIter i(cx, FrameIter::ALL_CONTEXTS,
-                          FrameIter::GO_THROUGH_SAVED,
-                          cx->compartment()->principals);
+    NonBuiltinScriptFrameIter i(cx, ScriptFrameIter::ALL_CONTEXTS,
+                                ScriptFrameIter::GO_THROUGH_SAVED,
+                                cx->compartment()->principals);
     for ( ; !i.done(); ++i) {
         if (!frames.append(i))
             return nullptr;

toolkit/devtools/webconsole/test/test_consoleapi.html

@@ -28,18 +28,6 @@ function doConsoleCalls(aState)
   top.console.dir(top.document, top.location);
   top.console.log("foo", longString);
 
-  function fromAsmJS() {
-      top.console.error("foobarBaz-asmjs-error", undefined);
-  }
-
-  (function(global, foreign) {
-    "use asm";
-    var fromAsmJS = foreign.fromAsmJS;
-    function inAsmJS2() { fromAsmJS() }
-    function inAsmJS1() { inAsmJS2() }
-    return inAsmJS1
-  })(null, { fromAsmJS:fromAsmJS })();
-
   expectedConsoleCalls = [
     {
       level: "log",
@@ -119,36 +107,6 @@ function doConsoleCalls(aState)
         },
       ],
     },
-    {
-      level: "error",
-      filename: /test_consoleapi/,
-      functionName: "fromAsmJS",
-      timeStamp: /^\d+$/,
-      arguments: ["foobarBaz-asmjs-error", { type: "undefined" }],
-
-      stacktrace: [
-        {
-          filename: /test_consoleapi/,
-          functionName: "fromAsmJS",
-        },
-        {
-          filename: /test_consoleapi/,
-          functionName: "inAsmJS2",
-        },
-        {
-          filename: /test_consoleapi/,
-          functionName: "inAsmJS1",
-        },
-        {
-          filename: /test_consoleapi/,
-          functionName: "doConsoleCalls",
-        },
-        {
-          filename: /test_consoleapi/,
-          functionName: "onAttach",
-        },
-      ],
-    },
   ];
 }