[MERGE chakra-core#1698 @MikeHolman] fix crash when using jscript ETW provider

MikeHolman · MikeHolman · commit 3655cb0c92b8 · 2016-10-06T15:05:45.000-07:00
Merge pull request chakra-core#1698 from MikeHolman:etw
diff --git a/lib/Backend/CodeGenWorkItem.h b/lib/Backend/CodeGenWorkItem.h
@@ -39,7 +39,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
@@ -945,8 +945,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);
 
@@ -1138,6 +1136,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
`@@ -39,7 +39,7 @@ struct CodeGenWorkItem : public JsUtil::Job`
`39`	`39`
`40`	`40`	`uint GetFunctionNumber() const`
`41`	`41`	`{`
`42`		`- return this->jitData.jitData->bodyData->funcNumber;`
	`42`	`+ return this->functionBody->GetFunctionNumber();`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`ExecutionMode GetJitMode() const`
Original file line number	Diff line number	Diff line change
`@@ -945,8 +945,6 @@ NativeCodeGenerator::CodeGen(PageAllocator * pageAllocator, CodeGenWorkItem* wor`
`945`	`945`	`(((double)((end_time.QuadPart - jitWriteData.startTime)* (double)1000.0 / (double)freq.QuadPart))) / (1));`
`946`	`946`	`Output::Flush();`
`947`	`947`	`}`
`948`		`- NativeCodeGenerator::LogCodeGenDone(workItem, &start_time);`
`949`		`-`
`950`	`948`
`951`	`949`	`workItem->GetFunctionBody()->SetFrameHeight(workItem->GetEntryPoint(), jitWriteData.frameHeight);`
`952`	`950`
`@@ -1138,6 +1136,8 @@ NativeCodeGenerator::CodeGen(PageAllocator * pageAllocator, CodeGenWorkItem* wor`
`1138`	`1136`	`}`
`1139`	`1137`	`#endif`
`1140`	`1138`
	`1139`	`+ NativeCodeGenerator::LogCodeGenDone(workItem, &start_time);`
	`1140`	`+`
`1141`	`1141`	`#ifdef ENABLE_BASIC_TELEMETRY`
`1142`	`1142`	`scriptContext->GetThreadContext()->JITTelemetry.LogTime(scriptContext->GetThreadContext()->JITTelemetry.Now() - startTime);`
`1143`	`1143`	`#endif`