Bug 1274193 part 10 - Use GO_THROUGH_SAVED in JS::GetScriptedCallerGlobal. r=luke
authorJan de Mooij <jdemooij@mozilla.com>
Tue, 24 May 2016 14:38:34 +0200
changeset 337765 472fd2e0cf31ade0406443a8980acd200d8569c1
parent 337764 8fa9dceab5e6426764a81e383e4b331ecc41d2e4
child 337766 b0a487d7e8e437a822fc788a87ef9ca8c7ee07c0
push id6249
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 13:59:36 +0000
treeherdermozilla-beta@bad9d4f5bf7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersluke
bugs1274193
milestone49.0a1
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
Bug 1274193 part 10 - Use GO_THROUGH_SAVED in JS::GetScriptedCallerGlobal. r=luke
js/src/jsapi.cpp
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -6491,17 +6491,17 @@ JS_PUBLIC_API(JSObject*)
 GetScriptedCallerGlobal(JSContext* cx)
 {
     Activation* activation;
 
     if (GetScriptedCallerActivationFast(cx, &activation)) {
         if (!activation)
             return nullptr;
     } else {
-        NonBuiltinFrameIter i(cx, FrameIter::STOP_AT_SAVED);
+        NonBuiltinFrameIter i(cx, FrameIter::GO_THROUGH_SAVED);
         if (i.done())
             return nullptr;
         activation = i.activation();
     }
 
     // If the caller is hidden, the embedding wants us to return null here so
     // that it can check its own stack (see HideScriptedCaller).
     if (activation->scriptedCallerIsHidden())