author | Wes Kocher <wkocher@mozilla.com> |
Fri, 27 Jun 2014 15:51:41 -0700 | |
changeset 191320 | 67cdb3cbea9f0ef3db994635c29a291241aa0b27 |
parent 191319 | d2e790e8bc8ef596046cdb6cfe7d9124bf72afb8 |
child 191321 | 3f4fe642a89367032843b2fc1527b1eb67d72f43 |
push id | 27041 |
push user | philringnalda@gmail.com |
push date | Sun, 29 Jun 2014 00:39:21 +0000 |
treeherder | mozilla-central@afa67a2f7905 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
bugs | 1030945 |
milestone | 33.0a1 |
backs out | d2e790e8bc8ef596046cdb6cfe7d9124bf72afb8 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/js/src/vm/SavedStacks.cpp +++ b/js/src/vm/SavedStacks.cpp @@ -478,18 +478,17 @@ SavedStacks::insertFrames(JSContext *cx, JSPrincipals* principals = iter.compartment()->principals; RootedAtom name(cx, iter.isNonEvalFunctionFrame() ? iter.functionDisplayAtom() : nullptr); // When we have a |JSScript| for this frame, use |getLocation| to get a // potentially memoized location result and copy it into |location|. When we // do not have a |JSScript| for this frame (asm.js frames), we take a slow // path that doesn't employ memoization, and update |location|'s slots // directly. - LocationValue location; - if (iter.hasScript()) { + LocationValue location;+ if (iter.hasScript()) { JSScript *script = iter.script(); jsbytecode *pc = iter.pc(); if (!getLocation(cx, script, pc, &location)) return false; } else { const char *filename = iter.scriptFilename(); if (!filename) filename = "";