[MERGE chakra-core#833] Adding back the flag for enabling opHelper checks only on jshost and ch hosts

satheeshravi · satheeshravi · commit 49f5d95d0f3a · 2016-04-20T19:02:03.000-07:00
Merge pull request chakra-core#833 from satheeshravi:Bug6628276 OpHelper Checks will be disabled on WebCrawler runs. These asserts do not seem make enough sense when they come from the crawler runs - as reverse engineering the scenario seems pretty tough. These asserts in DbCheckPostLowerer do not imply that there is a functional bug - it will indicate more of a code layout issue. With Louis' advice, these checks are enabled only on jshost and ch hosts.
diff --git a/bin/ch/ChakraRtInterface.h b/bin/ch/ChakraRtInterface.h
@@ -136,6 +136,9 @@ class ChakraRTInterface
     static HRESULT SetCheckMemoryLeakFlag(bool flag) { return CHECKED_CALL(SetCheckMemoryLeakFlag, flag); }
     static HRESULT SetEnableCheckMemoryLeakOutput(bool flag) { return CHECKED_CALL(SetEnableCheckMemoryLeakOutput, flag); }
 #endif
+#ifdef DEBUG
+    static HRESULT SetCheckOpHelpersFlag(bool flag) { return CHECKED_CALL(SetCheckOpHelpersFlag, flag); }
+#endif
 
     static HRESULT GetCrashOnExceptionFlag(bool * flag)
     {
diff --git a/bin/ch/ch.cpp b/bin/ch/ch.cpp
@@ -378,6 +378,10 @@ HRESULT ExecuteTest(LPCWSTR fileName)
     JsContextRef context = JS_INVALID_REFERENCE;
     IfJsErrorFailLog(ChakraRTInterface::JsCreateContext(runtime, &context));
     IfJsErrorFailLog(ChakraRTInterface::JsSetCurrentContext(context));
+    
+#ifdef DEBUG
+    ChakraRTInterface::SetCheckOpHelpersFlag(true);
+#endif
 
     if (!WScriptJsrt::Initialize())
     {
diff --git a/lib/Backend/DbCheckPostLower.cpp b/lib/Backend/DbCheckPostLower.cpp
@@ -9,7 +9,7 @@
 void
 DbCheckPostLower::Check()
 {
-    bool doOpHelperCheck = !this->func->isPostLayout;
+    bool doOpHelperCheck = Js::Configuration::Global.flags.CheckOpHelpers && !this->func->isPostLayout;
     bool isInHelperBlock = false;
 
     FOREACH_INSTR_IN_FUNC_EDITING(instr, instrNext, this->func)
diff --git a/lib/Common/ConfigFlagsList.h b/lib/Common/ConfigFlagsList.h
@@ -783,6 +783,7 @@ FLAGNR(Boolean, CheckEmitBufferPermissions, "Check JIT code buffers at commit an
 FLAGR (Boolean, CheckMemoryLeak       , "Check for heap memory leak", false)
 FLAGR (String,  DumpOnLeak            , "Create a dump on failed memory leak check", nullptr)
 #endif
+FLAGNR(Boolean, CheckOpHelpers        , "Verify opHelper labels in the JIT are set properly", false)
 FLAGNR(Boolean, CloneInlinedPolymorphicCaches, "Clones polymorphic inline caches in inlined functions", DEFAULT_CONFIG_CloneInlinedPolymorphicCaches)
 FLAGNR(Boolean, ConcurrentRuntime     , "Enable Concurrent GC and background JIT when creating runtime", DEFAULT_CONFIG_ConcurrentRuntime)
 FLAGNR(Boolean, Console               , "Create console window in GUI app", false)

Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,9 @@ class ChakraRTInterface`
`136`	`136`	`static HRESULT SetCheckMemoryLeakFlag(bool flag) { return CHECKED_CALL(SetCheckMemoryLeakFlag, flag); }`
`137`	`137`	`static HRESULT SetEnableCheckMemoryLeakOutput(bool flag) { return CHECKED_CALL(SetEnableCheckMemoryLeakOutput, flag); }`
`138`	`138`	`#endif`
	`139`	`+#ifdef DEBUG`
	`140`	`+ static HRESULT SetCheckOpHelpersFlag(bool flag) { return CHECKED_CALL(SetCheckOpHelpersFlag, flag); }`
	`141`	`+#endif`
`139`	`142`
`140`	`143`	`static HRESULT GetCrashOnExceptionFlag(bool * flag)`
`141`	`144`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`void`
`10`	`10`	`DbCheckPostLower::Check()`
`11`	`11`	`{`
`12`		`- bool doOpHelperCheck = !this->func->isPostLayout;`
	`12`	`+ bool doOpHelperCheck = Js::Configuration::Global.flags.CheckOpHelpers && !this->func->isPostLayout;`
`13`	`13`	`bool isInHelperBlock = false;`
`14`	`14`
`15`	`15`	`FOREACH_INSTR_IN_FUNC_EDITING(instr, instrNext, this->func)`