diff --git a/js/src/jit/CodeGenerator.cpp b/js/src/jit/CodeGenerator.cpp index 0632c78678e2..9e89eafde032 100644 --- a/js/src/jit/CodeGenerator.cpp +++ b/js/src/jit/CodeGenerator.cpp @@ -6997,13 +6997,6 @@ CodeGenerator::generate() masm.bind(&skipPrologue); -#ifdef JS_TRACE_LOGGING - if (!gen->compilingAsmJS()) { - emitTracelogScriptStart(); - emitTracelogStartEvent(TraceLogger_IonMonkey); - } -#endif - #ifdef DEBUG // Assert that the argument types are correct. generateArgumentsChecks(/* bailout = */ false); diff --git a/js/src/jit/arm/CodeGenerator-arm.cpp b/js/src/jit/arm/CodeGenerator-arm.cpp index ec5462e11f90..faa9b3ccb62b 100644 --- a/js/src/jit/arm/CodeGenerator-arm.cpp +++ b/js/src/jit/arm/CodeGenerator-arm.cpp @@ -50,6 +50,12 @@ CodeGeneratorARM::generatePrologue() // Note that this automatically sets MacroAssembler::framePushed(). masm.reserveStack(frameSize()); masm.checkStackAlignment(); + +#ifdef JS_TRACE_LOGGING + emitTracelogScriptStart(); + emitTracelogStartEvent(TraceLogger_IonMonkey); +#endif + return true; } diff --git a/js/src/jit/mips/CodeGenerator-mips.cpp b/js/src/jit/mips/CodeGenerator-mips.cpp index 0251df5d7f1a..0513d0a41b2d 100644 --- a/js/src/jit/mips/CodeGenerator-mips.cpp +++ b/js/src/jit/mips/CodeGenerator-mips.cpp @@ -48,6 +48,12 @@ CodeGeneratorMIPS::generatePrologue() // Note that this automatically sets MacroAssembler::framePushed(). masm.reserveStack(frameSize()); masm.checkStackAlignment(); + +#ifdef JS_TRACE_LOGGING + emitTracelogScriptStart(); + emitTracelogStartEvent(TraceLogger_IonMonkey); +#endif + return true; } @@ -58,10 +64,8 @@ CodeGeneratorMIPS::generateEpilogue() masm.bind(&returnLabel_); #ifdef JS_TRACE_LOGGING - if (gen->info().executionMode() == SequentialExecution) { - emitTracelogStopEvent(TraceLogger_IonMonkey); - emitTracelogScriptStop(); - } + emitTracelogStopEvent(TraceLogger_IonMonkey); + emitTracelogScriptStop(); #endif masm.freeStack(frameSize()); diff --git a/js/src/jit/shared/CodeGenerator-x86-shared.cpp b/js/src/jit/shared/CodeGenerator-x86-shared.cpp index 64100099ab8e..848230e0c0ec 100644 --- a/js/src/jit/shared/CodeGenerator-x86-shared.cpp +++ b/js/src/jit/shared/CodeGenerator-x86-shared.cpp @@ -46,6 +46,12 @@ CodeGeneratorX86Shared::generatePrologue() // Note that this automatically sets MacroAssembler::framePushed(). masm.reserveStack(frameSize()); + +#ifdef JS_TRACE_LOGGING + emitTracelogScriptStart(); + emitTracelogStartEvent(TraceLogger_IonMonkey); +#endif + return true; } @@ -57,10 +63,8 @@ CodeGeneratorX86Shared::generateEpilogue() masm.bind(&returnLabel_); #ifdef JS_TRACE_LOGGING - if (gen->info().executionMode() == SequentialExecution) { - emitTracelogStopEvent(TraceLogger_IonMonkey); - emitTracelogScriptStop(); - } + emitTracelogStopEvent(TraceLogger_IonMonkey); + emitTracelogScriptStop(); #endif // Pop the stack we allocated at the start of the function.