Bug 808294: Fix tracelogger builds, r=dvander
authorHannes Verschore <hv1989@gmail.com>
Mon, 05 Nov 2012 17:27:42 +0100
changeset 112313 041c8232bdcbc829664cf92541eb2feaf73aa9f1
parent 112312 516370bc10b7e8ed685b00d115067935d27c9e8c
child 112314 1cc2de645efdb3672bca63702742c54d91ca669c
push id23812
push useremorley@mozilla.com
push dateTue, 06 Nov 2012 14:01:34 +0000
treeherdermozilla-central@f4aeed115e54 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdvander
bugs808294
milestone19.0a1
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
Bug 808294: Fix tracelogger builds, r=dvander
js/src/TraceLogging.h
js/src/yarr/YarrJIT.h
--- a/js/src/TraceLogging.h
+++ b/js/src/TraceLogging.h
@@ -18,18 +18,18 @@ class TraceLogging
         ION_COMPILE_START,
         ION_COMPILE_STOP,
         ION_CANNON_START,
         ION_CANNON_STOP,
         ION_CANNON_BAIL,
         ION_SIDE_CANNON_START,
         ION_SIDE_CANNON_STOP,
         ION_SIDE_CANNON_BAIL,
-        YARR_YIT_START,
-        YARR_YIT_STOP,
+        YARR_JIT_START,
+        YARR_JIT_STOP,
         JM_SAFEPOINT_START,
         JM_SAFEPOINT_STOP,
         JM_START,
         JM_STOP,
         JM_COMPILE_START,
         JM_COMPILE_STOP,
         GC_START,
         GC_STOP,
--- a/js/src/yarr/YarrJIT.h
+++ b/js/src/yarr/YarrJIT.h
@@ -36,20 +36,20 @@
 #include "MatchResult.h"
 #include "Yarr.h"
 #include "YarrPattern.h"
 
 #if WTF_CPU_X86 && !WTF_COMPILER_MSVC && !WTF_COMPILER_SUNCC
 #define YARR_CALL __attribute__ ((regparm (3)))
 #else
 #define YARR_CALL
+#endif
 
-# if JS_TRACE_LOGGING
-#  include "TraceLogging.h"
-# endif
+#if JS_TRACE_LOGGING
+#include "TraceLogging.h"
 #endif
 
 namespace JSC {
 
 class JSGlobalData;
 class ExecutablePool;
 
 namespace Yarr {