Backed out changeset 32d9328cab02 (bug 1453795) as requested by Andi. CLOSED TREE
authorBrindusan Cristian <cbrindusan@mozilla.com>
Thu, 21 Jun 2018 13:30:07 +0300
changeset 480002 16ad556ccc7300cbfda54a14c49f650a82836f73
parent 480001 4b18075d2be22bc8fd1eeb0803a502cdce9782b4
child 480003 f18328bef6bb069e0b651c913281537b219b1dbd
push id1757
push userffxbld-merge
push dateFri, 24 Aug 2018 17:02:43 +0000
treeherdermozilla-release@736023aebdb1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1453795
milestone62.0a1
backs out32d9328cab02821a252de5a23f2f6de090d9e083
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
Backed out changeset 32d9328cab02 (bug 1453795) as requested by Andi. CLOSED TREE
js/xpconnect/loader/ChromeScriptLoader.cpp
js/xpconnect/src/BackstagePass.h
js/xpconnect/src/XPCCallContext.cpp
js/xpconnect/src/xpcprivate.h
--- a/js/xpconnect/loader/ChromeScriptLoader.cpp
+++ b/js/xpconnect/loader/ChromeScriptLoader.cpp
@@ -44,18 +44,16 @@ public:
                         const CompileScriptOptionsDictionary& aOptions,
                         Promise* aPromise)
       : mozilla::Runnable("AsyncScriptCompiler")
       , mOptions(aCx)
       , mURL(aURL)
       , mGlobalObject(aGlobal)
       , mPromise(aPromise)
       , mCharset(aOptions.mCharset)
-      , mToken(nullptr)
-      , mScriptLength(0)
     {
         mOptions.setNoScriptRval(!aOptions.mHasReturnValue)
                 .setCanLazilyParse(aOptions.mLazilyParse)
                 .setFile(aCx, mURL.get());
     }
 
     nsresult Start(nsIPrincipal* aPrincipal);
 
--- a/js/xpconnect/src/BackstagePass.h
+++ b/js/xpconnect/src/BackstagePass.h
@@ -36,17 +36,17 @@ public:
 
   void ForgetGlobalObject() {
     mWrapper = nullptr;
   }
 
   void SetGlobalObject(JSObject* global);
 
   explicit BackstagePass(nsIPrincipal* prin) :
-    mPrincipal(prin), mWrapper(nullptr)
+    mPrincipal(prin)
   {
   }
 
 private:
   virtual ~BackstagePass() { }
 
   nsCOMPtr<nsIPrincipal> mPrincipal;
   XPCWrappedNative* mWrapper;
--- a/js/xpconnect/src/XPCCallContext.cpp
+++ b/js/xpconnect/src/XPCCallContext.cpp
@@ -29,22 +29,17 @@ XPCCallContext::XPCCallContext(JSContext
                                Value* rval         /* = nullptr               */)
     :   mAr(cx),
         mState(INIT_FAILED),
         mXPC(nsXPConnect::XPConnect()),
         mXPCJSContext(nullptr),
         mJSContext(cx),
         mWrapper(nullptr),
         mTearOff(nullptr),
-        mMember(nullptr),
-        mName(cx),
-        mStaticMemberIsLocal(false),
-        mArgc(0),
-        mArgv(nullptr),
-        mRetVal(nullptr)
+        mName(cx)
 {
     MOZ_ASSERT(cx);
     MOZ_ASSERT(cx == nsContentUtils::GetCurrentJSContext());
 
     if (!mXPC)
         return;
 
     mXPCJSContext = XPCJSContext::Get();
--- a/js/xpconnect/src/xpcprivate.h
+++ b/js/xpconnect/src/xpcprivate.h
@@ -290,18 +290,20 @@ public:
 
 /***************************************************************************/
 
 class XPCRootSetElem
 {
 public:
     XPCRootSetElem()
     {
+#ifdef DEBUG
         mNext = nullptr;
         mSelfp = nullptr;
+#endif
     }
 
     ~XPCRootSetElem()
     {
         MOZ_ASSERT(!mNext, "Must be unlinked");
         MOZ_ASSERT(!mSelfp, "Must be unlinked");
     }