fix crash when using jscript ETW provider

MikeHolman · MikeHolman · commit 8e69a1ff55f8 · 2016-10-05T17:34:18.000-07:00
diff --git a/lib/Backend/CodeGenWorkItem.h b/lib/Backend/CodeGenWorkItem.h
@@ -42,7 +42,7 @@ struct CodeGenWorkItem : public JsUtil::Job
 
     uint GetFunctionNumber() const
     {
-        return this->jitData.jitData->bodyData->funcNumber;
+        return this->functionBody->GetFunctionNumber();
     }
 
     ExecutionMode GetJitMode() const
diff --git a/lib/Backend/NativeCodeGenerator.cpp b/lib/Backend/NativeCodeGenerator.cpp
@@ -958,8 +958,6 @@ NativeCodeGenerator::CodeGen(PageAllocator * pageAllocator, CodeGenWorkItem* wor
             (((double)((end_time.QuadPart - jitWriteData.startTime)* (double)1000.0 / (double)freq.QuadPart))) / (1));
         Output::Flush();
     }
-    NativeCodeGenerator::LogCodeGenDone(workItem, &start_time);
-
 
     workItem->GetFunctionBody()->SetFrameHeight(workItem->GetEntryPoint(), jitWriteData.frameHeight);
 
@@ -1151,6 +1149,8 @@ NativeCodeGenerator::CodeGen(PageAllocator * pageAllocator, CodeGenWorkItem* wor
     }
 #endif
 
+    NativeCodeGenerator::LogCodeGenDone(workItem, &start_time);
+
 #ifdef ENABLE_BASIC_TELEMETRY
     scriptContext->GetThreadContext()->JITTelemetry.LogTime(scriptContext->GetThreadContext()->JITTelemetry.Now() - startTime);
 #endif

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ struct CodeGenWorkItem : public JsUtil::Job`
`42`	`42`
`43`	`43`	`uint GetFunctionNumber() const`
`44`	`44`	`{`
`45`		`- return this->jitData.jitData->bodyData->funcNumber;`
	`45`	`+ return this->functionBody->GetFunctionNumber();`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`ExecutionMode GetJitMode() const`
Original file line number	Diff line number	Diff line change
`@@ -958,8 +958,6 @@ NativeCodeGenerator::CodeGen(PageAllocator * pageAllocator, CodeGenWorkItem* wor`
`958`	`958`	`(((double)((end_time.QuadPart - jitWriteData.startTime)* (double)1000.0 / (double)freq.QuadPart))) / (1));`
`959`	`959`	`Output::Flush();`
`960`	`960`	`}`
`961`		`- NativeCodeGenerator::LogCodeGenDone(workItem, &start_time);`
`962`		`-`
`963`	`961`
`964`	`962`	`workItem->GetFunctionBody()->SetFrameHeight(workItem->GetEntryPoint(), jitWriteData.frameHeight);`
`965`	`963`
`@@ -1151,6 +1149,8 @@ NativeCodeGenerator::CodeGen(PageAllocator * pageAllocator, CodeGenWorkItem* wor`
`1151`	`1149`	`}`
`1152`	`1150`	`#endif`
`1153`	`1151`
	`1152`	`+ NativeCodeGenerator::LogCodeGenDone(workItem, &start_time);`
	`1153`	`+`
`1154`	`1154`	`#ifdef ENABLE_BASIC_TELEMETRY`
`1155`	`1155`	`scriptContext->GetThreadContext()->JITTelemetry.LogTime(scriptContext->GetThreadContext()->JITTelemetry.Now() - startTime);`
`1156`	`1156`	`#endif`