Bug 1028529 - ensure IonSpewEndFunction is called once for each call to IonSpewNewFunction. r=nbp

js/src/jit/Ion.cpp

@@ -1905,7 +1905,9 @@ IonCompile(JSContext *cx, JSScript *script,
         builderScript->ionScript()->setRecompiling();
     }
 
-    IonSpewNewFunction(graph, builderScript);
+#ifdef DEBUG
+    IonSpewFunction ionSpewFunction(graph, builderScript);
+#endif
 
     bool succeeded = builder->build();
     builder->clearForBackEnd();
@@ -1941,8 +1943,6 @@ IonCompile(JSContext *cx, JSScript *script,
 
     bool success = codegen->link(cx, builder->constraints());
 
-    IonSpewEndFunction();
-
     return success ? AbortReason_NoAbort : AbortReason_Disable;
 }
 

js/src/jit/IonSpewer.cpp

@@ -425,5 +425,15 @@ jit::DisableChannel(IonSpewChannel channel)
     LoggingBits &= ~(1 << uint32_t(channel));
 }
 
+IonSpewFunction::IonSpewFunction(MIRGraph *graph, JS::HandleScript function)
+{
+    IonSpewNewFunction(graph, function);
+}
+
+IonSpewFunction::~IonSpewFunction()
+{
+    IonSpewEndFunction();
+}
+
 #endif /* DEBUG */
 

js/src/jit/IonSpewer.h

@@ -115,6 +115,13 @@ class IonSpewer
     void endFunction();
 };
 
+class IonSpewFunction
+{
+  public:
+    IonSpewFunction(MIRGraph *graph, JS::HandleScript function);
+    ~IonSpewFunction();
+};
+
 void IonSpewNewFunction(MIRGraph *graph, JS::HandleScript function);
 void IonSpewPass(const char *pass);
 void IonSpewPass(const char *pass, LinearScanAllocator *ra);