[MERGE #5991 @LouisLaf] Not all Win10 processes have CFG

LouisLaf · LouisLaf · commit 32a33ae59ff3 · 2019-03-08T10:58:12.000-08:00
Merge pull request #5991 from LouisLaf:cfg_fail My previous CFG change assumed that for Chakra.dll (which only runs on Win10), CFG had to be enabled. This is true for Edge, but not other processes as CFG is an opt-in feature.
diff --git a/lib/Common/Core/GlobalSecurityPolicy.cpp b/lib/Common/Core/GlobalSecurityPolicy.cpp
@@ -101,10 +101,6 @@ GlobalSecurityPolicy::GlobalSecurityPolicy()
         {
             RaiseFailFastException(nullptr, nullptr, FAIL_FAST_GENERATE_EXCEPTION_ADDRESS);
         }
-
-#if defined (NTBUILD)
-        AssertOrFailFast(readOnlyData.isCFGEnabled);
-#endif
     }
 
 #endif //_CONTROL_FLOW_GUARD

Original file line number	Diff line number	Diff line change
`@@ -101,10 +101,6 @@ GlobalSecurityPolicy::GlobalSecurityPolicy()`
`101`	`101`	`{`
`102`	`102`	`RaiseFailFastException(nullptr, nullptr, FAIL_FAST_GENERATE_EXCEPTION_ADDRESS);`
`103`	`103`	`}`
`104`		`-`
`105`		`-#if defined (NTBUILD)`
`106`		`- AssertOrFailFast(readOnlyData.isCFGEnabled);`
`107`		`-#endif`
`108`	`104`	`}`
`109`	`105`
`110`	`106`	`#endif //_CONTROL_FLOW_GUARD`