Backed out changeset 65624d4c4a65 (bug 1238121) to hopefully fix the intermittent hazard failures

--HG--
extra : commitid : 6SsEbxXjwKq

tools/profiler/public/GeckoProfilerImpl.h

@@ -411,26 +411,23 @@ protected:
   const char* mInfo;
 };
 
-class MOZ_RAII SamplerStackFrameRAII {
+class MOZ_STACK_CLASS SamplerStackFrameRAII {
 public:
   // we only copy the strings at save time, so to take multiple parameters we'd need to copy them then.
   SamplerStackFrameRAII(const char *aInfo,
-    js::ProfileEntry::Category aCategory, uint32_t line
-    MOZ_GUARD_OBJECT_NOTIFIER_PARAM)
+    js::ProfileEntry::Category aCategory, uint32_t line)
   {
-    MOZ_GUARD_OBJECT_NOTIFIER_INIT;
     mHandle = mozilla_sampler_call_enter(aInfo, aCategory, this, false, line);
   }
   ~SamplerStackFrameRAII() {
     mozilla_sampler_call_exit(mHandle);
   }
 private:
-  MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
   void* mHandle;
 };
 
 static const int SAMPLER_MAX_STRING = 128;
-class MOZ_RAII SamplerStackFramePrintfRAII {
+class MOZ_STACK_CLASS SamplerStackFramePrintfRAII {
 public:
   // we only copy the strings at save time, so to take multiple parameters we'd need to copy them then.
   SamplerStackFramePrintfRAII(const char *aInfo,