From f93906ced7725b5fcd248b10950fbdfef8188c5b Mon Sep 17 00:00:00 2001 From: Jan Kotas Date: Mon, 1 Jul 2019 19:46:37 -0700 Subject: [PATCH] Delete dead code (#25513) --- src/System.Private.CoreLib/src/System/Exception.CoreCLR.cs | 11 ----------- src/vm/comutilnative.cpp | 9 --------- src/vm/ecalllist.h | 1 - 3 files changed, 21 deletions(-) diff --git a/src/System.Private.CoreLib/src/System/Exception.CoreCLR.cs b/src/System.Private.CoreLib/src/System/Exception.CoreCLR.cs index 7597a5b..448ba0e 100644 --- a/src/System.Private.CoreLib/src/System/Exception.CoreCLR.cs +++ b/src/System.Private.CoreLib/src/System/Exception.CoreCLR.cs @@ -372,14 +372,6 @@ namespace System // See src\inc\corexcep.h's EXCEPTION_COMPLUS definition: private const int _COMPlusExceptionCode = unchecked((int)0xe0434352); // Win32 exception code for COM+ exceptions - internal bool IsTransient - { - get - { - return nIsTransient(HResult); - } - } - private string? SerializationRemoteStackTraceString => _remoteStackTraceString; private object? SerializationWatsonBuckets => _watsonBuckets; @@ -399,9 +391,6 @@ namespace System } } - [MethodImplAttribute(MethodImplOptions.InternalCall)] - private static extern bool nIsTransient(int hr); - // This piece of infrastructure exists to help avoid deadlocks // between parts of mscorlib that might throw an exception while // holding a lock that are also used by mscorlib's ResourceManager diff --git a/src/vm/comutilnative.cpp b/src/vm/comutilnative.cpp index 27d85f6..930905b 100644 --- a/src/vm/comutilnative.cpp +++ b/src/vm/comutilnative.cpp @@ -125,15 +125,6 @@ FCIMPL1(FC_BOOL_RET, ExceptionNative::IsImmutableAgileException, Object* pExcept } FCIMPLEND -FCIMPL1(FC_BOOL_RET, ExceptionNative::IsTransient, INT32 hresult) -{ - FCALL_CONTRACT; - - FC_RETURN_BOOL(Exception::IsTransient(hresult)); -} -FCIMPLEND - - // This FCall sets a flag against the thread exception state to indicate to // IL_Throw and the StackTraceInfo implementation to account for the fact // that we have restored a foreign exception dispatch details. diff --git a/src/vm/ecalllist.h b/src/vm/ecalllist.h index 3b9d6b1..62e2241 100644 --- a/src/vm/ecalllist.h +++ b/src/vm/ecalllist.h @@ -177,7 +177,6 @@ FCFuncEnd() FCFuncStart(gExceptionFuncs) FCFuncElement("IsImmutableAgileException", ExceptionNative::IsImmutableAgileException) - FCFuncElement("nIsTransient", ExceptionNative::IsTransient) FCFuncElement("GetMethodFromStackTrace", SystemNative::GetMethodFromStackTrace) QCFuncElement("GetMessageFromNativeResources", ExceptionNative::GetMessageFromNativeResources) FCFuncElement("PrepareForForeignExceptionRaise", ExceptionNative::PrepareForForeignExceptionRaise) -- 2.7.4