Cleanup (#27502)

* Delete empty FireCustomerDebugProbe FCall * Delete duplicate C++ compiler command line options
dotnet · Oct 28, 2019 · 8460516 · 8460516
1 parent 5075054
commit 8460516
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 42 deletions.
diff --git a/configurecompiler.cmake b/configurecompiler.cmake
@@ -454,7 +454,7 @@ if (CLR_CMAKE_PLATFORM_UNIX)
   add_compile_options(-fno-omit-frame-pointer)
 
   # The -fms-extensions enable the stuff like __if_exists, __declspec(uuid()), etc.
-  add_compile_options(-fms-extensions )
+  add_compile_options(-fms-extensions)
   #-fms-compatibility      Enable full Microsoft Visual C++ compatibility
   #-fms-extensions         Accept some non-standard constructs supported by the Microsoft compiler
 
@@ -511,9 +511,7 @@ if (CLR_CMAKE_PLATFORM_UNIX)
     # may not generate the same object layout as MSVC.
     add_compile_options(-Wno-incompatible-ms-struct)
   else()
-    add_compile_options(-Wno-unused-variable)
     add_compile_options(-Wno-unused-but-set-variable)
-    add_compile_options(-fms-extensions)
     add_compile_options(-Wno-unknown-pragmas)
     if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
       add_compile_options(-Wno-nonnull-compare)

diff --git a/src/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -257,7 +257,6 @@
     <Compile Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\TypeDependencyAttribute.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Runtime\GCSettings.CoreCLR.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Runtime\InteropServices\ComTypes\IEnumerable.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\InteropServices\CriticalHandle.CoreCLR.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Runtime\InteropServices\Expando\IExpando.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Runtime\InteropServices\GCHandle.CoreCLR.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Runtime\InteropServices\Marshal.CoreCLR.cs" />

diff --git a/src/System.Private.CoreLib/shared/System/Runtime/InteropServices/CriticalHandle.cs b/src/System.Private.CoreLib/shared/System/Runtime/InteropServices/CriticalHandle.cs
@@ -149,8 +149,7 @@ private void Cleanup()
             // occur implicitly as part of unmarshaling another P/Invoke).
             int lastError = Marshal.GetLastWin32Error();
 
-            if (!ReleaseHandle())
-                ReleaseHandleFailed();
+            ReleaseHandle();
 
             Marshal.SetLastWin32Error(lastError);
             GC.SuppressFinalize(this);

diff --git a/src/System.Private.CoreLib/src/System/Runtime/InteropServices/CriticalHandle.CoreCLR.cs b/src/System.Private.CoreLib/src/System/Runtime/InteropServices/CriticalHandle.CoreCLR.cs
diff --git a/src/vm/ecalllist.h b/src/vm/ecalllist.h
@@ -186,10 +186,6 @@ FCFuncStart(gExceptionFuncs)
     FCFuncElement("GetExceptionCount", ExceptionNative::GetExceptionCount)
 FCFuncEnd()
 
-FCFuncStart(gCriticalHandleFuncs)
-    FCFuncElement("ReleaseHandleFailed", CriticalHandle::FireCustomerDebugProbe)
-FCFuncEnd()
-
 FCFuncStart(gTypedReferenceFuncs)
     FCFuncElement("InternalToObject", ReflectionInvocation::TypedReferenceToObject)
     FCFuncElement("InternalMakeTypedReference", ReflectionInvocation::MakeTypedReference)
@@ -1217,7 +1213,6 @@ FCClassElement("AssemblyName", "System.Reflection", gAssemblyNameFuncs)
 FCClassElement("Buffer", "System", gBufferFuncs)
 FCClassElement("CLRConfig", "System", gClrConfig)
 FCClassElement("CompatibilitySwitch", "System.Runtime.Versioning", gCompatibilitySwitchFuncs)
-FCClassElement("CriticalHandle", "System.Runtime.InteropServices", gCriticalHandleFuncs)
 FCClassElement("CustomAttribute", "System.Reflection", gCOMCustomAttributeFuncs)
 FCClassElement("CustomAttributeEncodedArgument", "System.Reflection", gCustomAttributeEncodedArgument)
 FCClassElement("DateTime", "System", gDateTimeFuncs)

diff --git a/src/vm/object.h b/src/vm/object.h
@@ -2128,8 +2128,6 @@ class CriticalHandle : public Object
     static size_t GetHandleOffset() { LIMITED_METHOD_CONTRACT; return offsetof(CriticalHandle, m_handle); }
 
     void SetHandle(LPVOID handle) { LIMITED_METHOD_CONTRACT; m_handle = handle; }
-
-    static FCDECL1(void, FireCustomerDebugProbe, CriticalHandle* refThisUNSAFE);
 };
 
 

diff --git a/src/vm/safehandle.cpp b/src/vm/safehandle.cpp
@@ -219,17 +219,3 @@ void SafeHandle::RunReleaseMethod(SafeHandle* psh)
 
     GCPROTECT_END();
 }
-
-FCIMPL1(void, CriticalHandle::FireCustomerDebugProbe, CriticalHandle* refThisUNSAFE)
-{
-    FCALL_CONTRACT;
-
-    CRITICALHANDLEREF ch(refThisUNSAFE);
-
-    HELPER_METHOD_FRAME_BEGIN_1(ch);
-
-    FCUnique(0x53);
-
-    HELPER_METHOD_FRAME_END();
-}
-FCIMPLEND
-Original file line number
+Diff line change
@@ Expand Up / @@ -2128,8 +2128,6 @@ class CriticalHandle : public Object @@
         static size_t GetHandleOffset() { LIMITED_METHOD_CONTRACT; return offsetof(CriticalHandle, m_handle); }
         void SetHandle(LPVOID handle) { LIMITED_METHOD_CONTRACT; m_handle = handle; }
-        static FCDECL1(void, FireCustomerDebugProbe, CriticalHandle* refThisUNSAFE);
     };
@@ Expand Down @@