Bug 981167 - Followup: rm dead perThread_ member of ScriptFrameIter::Data. (r=me)

js/src/vm/Stack.cpp

@@ -626,10 +626,9 @@ FrameIter::settleOnActivation()
     }
 }
 
-FrameIter::Data::Data(JSContext *cx, PerThreadData *perThread, SavedOption savedOption,
-                      ContextOption contextOption, JSPrincipals *principals)
-  : perThread_(perThread),
-    cx_(cx),
+FrameIter::Data::Data(JSContext *cx, SavedOption savedOption, ContextOption contextOption,
+                      JSPrincipals *principals)
+  : cx_(cx),
     savedOption_(savedOption),
     contextOption_(contextOption),
     principals_(principals),
@@ -643,8 +642,7 @@ FrameIter::Data::Data(JSContext *cx, PerThreadData *perThread, SavedOption saved
 }
 
 FrameIter::Data::Data(const FrameIter::Data &other)
-  : perThread_(other.perThread_),
-    cx_(other.cx_),
+  : cx_(other.cx_),
     savedOption_(other.savedOption_),
     contextOption_(other.contextOption_),
     principals_(other.principals_),
@@ -659,7 +657,7 @@ FrameIter::Data::Data(const FrameIter::Data &other)
 }
 
 FrameIter::FrameIter(JSContext *cx, SavedOption savedOption)
-  : data_(cx, &cx->runtime()->mainThread, savedOption, CURRENT_CONTEXT, nullptr)
+  : data_(cx, savedOption, CURRENT_CONTEXT, nullptr)
 #ifdef JS_ION
     , ionInlineFrames_(cx, (js::jit::IonFrameIterator*) nullptr)
 #endif
@@ -669,7 +667,7 @@ FrameIter::FrameIter(JSContext *cx, SavedOption savedOption)
 
 FrameIter::FrameIter(JSContext *cx, ContextOption contextOption,
                      SavedOption savedOption, JSPrincipals *principals)
-  : data_(cx, &cx->runtime()->mainThread, savedOption, contextOption, principals)
+  : data_(cx, savedOption, contextOption, principals)
 #ifdef JS_ION
     , ionInlineFrames_(cx, (js::jit::IonFrameIterator*) nullptr)
 #endif

js/src/vm/Stack.h

@@ -1489,7 +1489,6 @@ class FrameIter
     // the heap, so this structure should not contain any GC things.
     struct Data
     {
-        PerThreadData * perThread_;
         JSContext *     cx_;
         SavedOption     savedOption_;
         ContextOption   contextOption_;
@@ -1506,8 +1505,8 @@ class FrameIter
         jit::IonFrameIterator ionFrames_;
 #endif
 
-        Data(JSContext *cx, PerThreadData *perThread, SavedOption savedOption,
-             ContextOption contextOption, JSPrincipals *principals);
+        Data(JSContext *cx, SavedOption savedOption, ContextOption contextOption,
+             JSPrincipals *principals);
         Data(const Data &other);
     };