Avoid unnecessary handling in _ReportUnobservedException (#3909)

Co-authored-by: Casey Carter <[email protected]> Co-authored-by: Stephan T. Lavavej <[email protected]>
microsoft · Aug 1, 2023 · fc444ce · fc444ce
1 parent 19528fa
commit fc444ce
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/stl/src/ppltasks.cpp b/stl/src/ppltasks.cpp
@@ -36,15 +36,13 @@ namespace Concurrency {
 
     namespace details {
         [[noreturn]] _CRTIMP2 void __cdecl _ReportUnobservedException() {
-
-#if (defined(_M_IX86) || defined(_M_X64)) && !defined(_CRT_APP)
-            if (IsProcessorFeaturePresent(PF_FASTFAIL_AVAILABLE))
-#endif
-            {
-                __fastfail(FAST_FAIL_INVALID_ARG);
+#if (defined(_M_IX86) || defined(_M_X64)) && !defined(_CRT_APP) && _STL_WIN32_WINNT < _WIN32_WINNT_WIN8
+            if (!IsProcessorFeaturePresent(PF_FASTFAIL_AVAILABLE)) {
+                std::abort();
             }
+#endif // ^^^ __fastfail conditionally available ^^^
 
-            std::terminate();
+            __fastfail(FAST_FAIL_INVALID_ARG);
         }
 
         namespace platform {