Remove SOS's CRT invalid parameter handler (#4303)

SOS does get built dynamically linking to the C++ CRT in release so the
invalid parameter handler that gets installed affects all the code in
the process.

Fixes issue: https://github.com/dotnet/diagnostics/issues/4070

diff --git a/src/SOS/SOS.UnitTests/Debuggees/DesktopClrHost/CMakeLists.txt b/src/SOS/SOS.UnitTests/Debuggees/DesktopClrHost/CMakeLists.txt
index 3d06e95d2cdc5c30ffc632f520c6a04d7ffb7f88..d27bd7a780aa0e14bd0bb1cb359127d373aef7b4 100644 (file)
--- a/src/SOS/SOS.UnitTests/Debuggees/DesktopClrHost/CMakeLists.txt
+++ b/src/SOS/SOS.UnitTests/Debuggees/DesktopClrHost/CMakeLists.txt
@@ -6,7 +6,6 @@ include_directories(inc)
 include_directories("$ENV{VSInstallDir}/DIA SDK/include")
 
 add_definitions(-DUSE_STL)
-add_definitions(-MT) 
 
 set(DESKTOPCLRHOST_SOURCES
     DesktopClrHost.cpp

diff --git a/src/SOS/Strike/CMakeLists.txt b/src/SOS/Strike/CMakeLists.txt
index dcd7994672543e3b23aa8188f5c179a6af3a2fbd..d72a5aa6b53dfd5c320d8c6175f989b0c82db57f 100644 (file)
--- a/src/SOS/Strike/CMakeLists.txt
+++ b/src/SOS/Strike/CMakeLists.txt
@@ -32,9 +32,9 @@ if(CLR_CMAKE_HOST_ARCH_AMD64)
   add_definitions(-D_TARGET_WIN64_=1)
   add_definitions(-DDBG_TARGET_64BIT)
   add_definitions(-DDBG_TARGET_WIN64=1)
-  if(WIN32)
+  if (CLR_CMAKE_HOST_WIN32)
     add_definitions(-DSOS_TARGET_ARM64=1)
-  endif(WIN32)
+  endif(CLR_CMAKE_HOST_WIN32)
   remove_definitions(-D_TARGET_ARM64_=1)
   add_definitions(-D_TARGET_AMD64_)
   add_definitions(-DDBG_TARGET_AMD64)
@@ -44,9 +44,9 @@ elseif(CLR_CMAKE_HOST_ARCH_I386)
   add_definitions(-D_TARGET_X86_=1)
   add_definitions(-DTARGET_X86)
   add_definitions(-DDBG_TARGET_32BIT)
-  if(WIN32)
+  if (CLR_CMAKE_HOST_WIN32)
     add_definitions(-DSOS_TARGET_ARM=1)
-  endif(WIN32)
+  endif(CLR_CMAKE_HOST_WIN32)
 elseif(CLR_CMAKE_HOST_ARCH_ARM)
   message(STATUS "CLR_CMAKE_HOST_ARCH_ARM")
   add_definitions(-DSOS_TARGET_ARM=1)
@@ -73,12 +73,9 @@ include_directories(${ROOT_DIR}/src/SOS/extensions)
 include_directories(${CLR_SHARED_DIR}/gcdump)
 include_directories(platform)
 
-if(WIN32)
+if (CLR_CMAKE_HOST_WIN32)
   add_definitions(-DUSE_STL)
 
-  #use static crt
-  add_definitions(-MT) 
-
   set(SOS_SOURCES
     disasm.cpp
     dllsext.cpp
@@ -138,7 +135,7 @@ if(WIN32)
         mscoree.lib)
   endif(NOT CLR_CMAKE_HOST_ARCH_ARM64 AND NOT CLR_CMAKE_HOST_ARCH_ARM)
 
-else(WIN32)
+else(CLR_CMAKE_HOST_WIN32)
   add_definitions(-DFEATURE_ENABLE_HARDWARE_EXCEPTIONS)
   add_definitions(-DPAL_STDCPP_COMPAT=1)
   add_compile_options(-Wno-null-arithmetic)
@@ -187,28 +184,28 @@ else(WIN32)
     coreclrpal
   )
 
-endif(WIN32)
+endif(CLR_CMAKE_HOST_WIN32)
 
 if(CLR_CMAKE_HOST_ARCH_AMD64)
   set(SOS_SOURCES_ARCH
     disasmX86.cpp
   )
-  if(WIN32)
+  if (CLR_CMAKE_HOST_WIN32)
     list(APPEND 
       SOS_SOURCES_ARCH  
       disasmARM64.cpp
     )
-  endif(WIN32)
+  endif(CLR_CMAKE_HOST_WIN32)
 elseif(CLR_CMAKE_HOST_ARCH_I386)
   set(SOS_SOURCES_ARCH 
     disasmX86.cpp
   )
-  if(WIN32)
+  if (CLR_CMAKE_HOST_WIN32)
     list(APPEND
       SOS_SOURCES_ARCH
       disasmARM.cpp
     )
-  endif(WIN32)
+  endif(CLR_CMAKE_HOST_WIN32)
 elseif(CLR_CMAKE_HOST_ARCH_ARM)
   set(SOS_SOURCES_ARCH
     disasmARM.cpp
@@ -246,6 +243,6 @@ target_link_libraries(sos ${SOS_LIBRARY})
 # add the install targets
 install_clr(TARGETS sos DESTINATIONS .)
 
-if(NOT WIN32)
+if(NOT CLR_CMAKE_HOST_WIN32)
   install(FILES sosdocsunix.txt DESTINATION .)
-endif(NOT WIN32)
+endif(NOT CLR_CMAKE_HOST_WIN32)

diff --git a/src/SOS/Strike/exts.cpp b/src/SOS/Strike/exts.cpp
index 836f38b0d93b8b02f2fe1bf932d6ac2c2d4a1c98..112e42bd988040d4b9613855e571fae7789d6d5c 100644 (file)
--- a/src/SOS/Strike/exts.cpp
+++ b/src/SOS/Strike/exts.cpp
@@ -264,20 +264,6 @@ DACMessage(HRESULT Status)
 BOOL IsMiniDumpFileNODAC();
 extern HMODULE g_hInstance;
 
-// This function throws an exception that can be caught by the debugger,
-// instead of allowing the default CRT behavior of invoking Watson to failfast.
-void __cdecl _SOS_invalid_parameter(
-   const WCHAR * expression,
-   const WCHAR * function, 
-   const WCHAR * file, 
-   unsigned int line,
-   uintptr_t pReserved
-)
-{
-    ExtErr("\nSOS failure!\n");
-    throw "SOS failure";
-}
-
 bool g_Initialized = false;
 const char* g_sosPrefix = "";
 
@@ -345,12 +331,6 @@ DebugExtensionInitialize(PULONG Version, PULONG Flags)
     }
     ExtRelease();
     
-#ifndef _ARM_
-    // Make sure we do not tear down the debugger when a security function fails
-    // Since we link statically against CRT this will only affect the SOS module.
-    _set_invalid_parameter_handler(_SOS_invalid_parameter);
-#endif
-    
     return S_OK;
 }
 

diff --git a/src/SOS/extensions/CMakeLists.txt b/src/SOS/extensions/CMakeLists.txt
index faff99173954085ac27cbd74805ce3a6d2b9bf1e..bb4f7bf47f568626eef897b268cc7e7ebba83324 100644 (file)
--- a/src/SOS/extensions/CMakeLists.txt
+++ b/src/SOS/extensions/CMakeLists.txt
@@ -2,10 +2,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 include(configure.cmake)
 
-if(WIN32)
-    add_definitions(-MT)
-endif(WIN32)
-
 add_definitions(-DPAL_STDCPP_COMPAT)
 
 include_directories(${ROOT_DIR}/src/SOS/inc)

diff --git a/src/SOS/runcommand/CMakeLists.txt b/src/SOS/runcommand/CMakeLists.txt
index 469d802405b3e45c8b764d1bf6c956801d546c58..c9b492de8a29e2a2eb61aa6468a73ef0804476e7 100644 (file)
--- a/src/SOS/runcommand/CMakeLists.txt
+++ b/src/SOS/runcommand/CMakeLists.txt
@@ -7,9 +7,6 @@ include_directories("$ENV{VSInstallDir}/DIA SDK/include")
 
 add_definitions(-DUSE_STL)
 
-#use static crt
-add_definitions(-MT) 
-
 set(RUNCOMMAND_SOURCES
     runcommand.cpp
 )