Backed out changeset 4e4358c01816 (bug 1016629)

xpcom/threads/ThreadStackHelper.cpp

@@ -109,18 +109,6 @@ ThreadStackHelper::~ThreadStackHelper()
 #endif
 }
 
-namespace {
-template <typename T>
-class ScopedSetPtr
-{
-private:
-  T*& mPtr;
-public:
-  ScopedSetPtr(T*& p, T* val) : mPtr(p) { mPtr = val; }
-  ~ScopedSetPtr() { mPtr = nullptr; }
-};
-}
-
 void
 ThreadStackHelper::GetStack(Stack& aStack)
 {
@@ -130,8 +118,6 @@ ThreadStackHelper::GetStack(Stack& aStack)
     return;
   }
 
-  ScopedSetPtr<Stack> stackPtr(mStackToFill, &aStack);
-
 #if defined(XP_LINUX)
   if (!sInitialized) {
     MOZ_ASSERT(false);
@@ -213,6 +199,7 @@ ThreadStackHelper::PrepareStackBuffer(Stack& aStack)
       !aStack.EnsureBufferCapacity(mMaxBufferSize)) {
     return false;
   }
+  mStackToFill = &aStack;
   return true;
 #else
   return false;