From dd8329ed1c122649493d60f91b1ec43e678d852e Mon Sep 17 00:00:00 2001 From: danmosemsft Date: Sun, 22 Jan 2017 20:29:22 -0800 Subject: [PATCH] Remove FEATURE_EXCEPTIONDISPATCHINFO Commit migrated from https://github.com/dotnet/coreclr/commit/b22d638a79c93fad06ad30f49cd74c69e25deefe --- src/coreclr/clr.coreclr.props | 1 - src/coreclr/clr.defines.targets | 2 -- src/coreclr/clr.desktop.props | 1 - src/coreclr/src/mscorlib/mscorlib.shared.sources.props | 2 +- src/coreclr/src/mscorlib/src/System/Diagnostics/Stackframe.cs | 6 ------ src/coreclr/src/mscorlib/src/System/Diagnostics/Stacktrace.cs | 10 ---------- src/coreclr/src/mscorlib/src/System/Exception.cs | 2 -- .../Runtime/ExceptionServices/ExceptionServicesCommon.cs | 2 -- 8 files changed, 1 insertion(+), 25 deletions(-) diff --git a/src/coreclr/clr.coreclr.props b/src/coreclr/clr.coreclr.props index 6236f56..a8b9008 100644 --- a/src/coreclr/clr.coreclr.props +++ b/src/coreclr/clr.coreclr.props @@ -15,7 +15,6 @@ true true true - true true true true diff --git a/src/coreclr/clr.defines.targets b/src/coreclr/clr.defines.targets index 3ba21c9..5bff02f 100644 --- a/src/coreclr/clr.defines.targets +++ b/src/coreclr/clr.defines.targets @@ -33,7 +33,6 @@ $(CDefines);FEATURE_DBG_PUBLISH $(CDefines);FEATURE_EVENT_TRACE $(CDefines);FEATURE_EVENTSOURCE_XPLAT - $(CDefines);FEATURE_EXCEPTIONDISPATCHINFO $(CDefines);FEATURE_EXCEPTION_NOTIFICATIONS $(CDefines);FEATURE_FULL_NGEN $(CDefines);FEATURE_FUSION @@ -143,7 +142,6 @@ $(DefineConstants);FEATURE_CRYPTO $(DefineConstants);FEATURE_DISPLAY_CULTURE_INFO $(DefineConstants);FEATURE_DISPLAY_REGION_INFO - $(DefineConstants);FEATURE_EXCEPTIONDISPATCHINFO $(DefineConstants);FEATURE_EXCEPTION_NOTIFICATIONS $(DefineConstants);FEATURE_FUSION $(DefineConstants);FEATURE_HOST_ASSEMBLY_RESOLVER diff --git a/src/coreclr/clr.desktop.props b/src/coreclr/clr.desktop.props index af96399..75a6bcc 100644 --- a/src/coreclr/clr.desktop.props +++ b/src/coreclr/clr.desktop.props @@ -32,7 +32,6 @@ true true true - true true true true diff --git a/src/coreclr/src/mscorlib/mscorlib.shared.sources.props b/src/coreclr/src/mscorlib/mscorlib.shared.sources.props index 6362bf4..e25001f 100644 --- a/src/coreclr/src/mscorlib/mscorlib.shared.sources.props +++ b/src/coreclr/src/mscorlib/mscorlib.shared.sources.props @@ -910,7 +910,7 @@ - + diff --git a/src/coreclr/src/mscorlib/src/System/Diagnostics/Stackframe.cs b/src/coreclr/src/mscorlib/src/System/Diagnostics/Stackframe.cs index 06d675e..bdfd1e0 100644 --- a/src/coreclr/src/mscorlib/src/System/Diagnostics/Stackframe.cs +++ b/src/coreclr/src/mscorlib/src/System/Diagnostics/Stackframe.cs @@ -23,10 +23,8 @@ namespace System.Diagnostics { private int iLineNumber; private int iColumnNumber; -#if FEATURE_EXCEPTIONDISPATCHINFO [System.Runtime.Serialization.OptionalField] private bool fIsLastFrameFromForeignExceptionStackTrace; -#endif // FEATURE_EXCEPTIONDISPATCHINFO internal void InitMembers() { @@ -36,9 +34,7 @@ namespace System.Diagnostics { strFileName = null; iLineNumber = 0; iColumnNumber = 0; -#if FEATURE_EXCEPTIONDISPATCHINFO fIsLastFrameFromForeignExceptionStackTrace = false; -#endif // FEATURE_EXCEPTIONDISPATCHINFO } @@ -142,7 +138,6 @@ namespace System.Diagnostics { iColumnNumber = iCol; } -#if FEATURE_EXCEPTIONDISPATCHINFO internal virtual void SetIsLastFrameFromForeignExceptionStackTrace (bool fIsLastFrame) { fIsLastFrameFromForeignExceptionStackTrace = fIsLastFrame; @@ -152,7 +147,6 @@ namespace System.Diagnostics { { return fIsLastFrameFromForeignExceptionStackTrace; } -#endif // FEATURE_EXCEPTIONDISPATCHINFO // Returns the method the frame is executing // diff --git a/src/coreclr/src/mscorlib/src/System/Diagnostics/Stacktrace.cs b/src/coreclr/src/mscorlib/src/System/Diagnostics/Stacktrace.cs index 7dc5d9d..128ae3c 100644 --- a/src/coreclr/src/mscorlib/src/System/Diagnostics/Stacktrace.cs +++ b/src/coreclr/src/mscorlib/src/System/Diagnostics/Stacktrace.cs @@ -49,10 +49,8 @@ namespace System.Diagnostics { private String[] rgFilename; private int[] rgiLineNumber; private int[] rgiColumnNumber; -#if FEATURE_EXCEPTIONDISPATCHINFO [OptionalField] private bool[] rgiLastFrameFromForeignExceptionStackTrace; -#endif // FEATURE_EXCEPTIONDISPATCHINFO private GetSourceLineInfoDelegate getSourceLineInfo; private int iFrameCount; #pragma warning restore 414 @@ -86,9 +84,7 @@ namespace System.Diagnostics { rgiColumnNumber = null; getSourceLineInfo = null; -#if FEATURE_EXCEPTIONDISPATCHINFO rgiLastFrameFromForeignExceptionStackTrace = null; -#endif // FEATURE_EXCEPTIONDISPATCHINFO // 0 means capture all frames. For StackTraces from an Exception, the EE always // captures all frames. For other uses of StackTraces, we can abort stack walking after @@ -198,12 +194,10 @@ namespace System.Diagnostics { public virtual int GetLineNumber(int i) { return rgiLineNumber == null ? 0 : rgiLineNumber[i];} public virtual int GetColumnNumber(int i) { return rgiColumnNumber == null ? 0 : rgiColumnNumber[i];} -#if FEATURE_EXCEPTIONDISPATCHINFO public virtual bool IsLastFrameFromForeignExceptionStackTrace(int i) { return (rgiLastFrameFromForeignExceptionStackTrace == null)?false:rgiLastFrameFromForeignExceptionStackTrace[i]; } -#endif // FEATURE_EXCEPTIONDISPATCHINFO public virtual int GetNumberOfFrames() { return iFrameCount;} public virtual void SetNumberOfFrames(int i) { iFrameCount = i;} @@ -468,9 +462,7 @@ namespace System.Diagnostics { sfTemp.SetOffset(StackF.GetOffset(i)); sfTemp.SetILOffset(StackF.GetILOffset(i)); -#if FEATURE_EXCEPTIONDISPATCHINFO sfTemp.SetIsLastFrameFromForeignExceptionStackTrace(StackF.IsLastFrameFromForeignExceptionStackTrace(i)); -#endif // FEATURE_EXCEPTIONDISPATCHINFO if (fNeedFileInfo) { @@ -680,13 +672,11 @@ namespace System.Diagnostics { } } -#if FEATURE_EXCEPTIONDISPATCHINFO if (sf.GetIsLastFrameFromForeignExceptionStackTrace()) { sb.Append(Environment.NewLine); sb.Append(Environment.GetResourceString("Exception_EndStackTraceFromPreviousThrow")); } -#endif // FEATURE_EXCEPTIONDISPATCHINFO } } diff --git a/src/coreclr/src/mscorlib/src/System/Exception.cs b/src/coreclr/src/mscorlib/src/System/Exception.cs index 026ce4e..ebf5819 100644 --- a/src/coreclr/src/mscorlib/src/System/Exception.cs +++ b/src/coreclr/src/mscorlib/src/System/Exception.cs @@ -660,7 +660,6 @@ namespace System { _stackTraceString = null; } -#if FEATURE_EXCEPTIONDISPATCHINFO // This is the object against which a lock will be taken // when attempt to restore the EDI. Since its static, its possible @@ -784,7 +783,6 @@ namespace System { } } } -#endif // FEATURE_EXCEPTIONDISPATCHINFO private String _className; //Needed for serialization. private MethodBase _exceptionMethod; //Needed for serialization. diff --git a/src/coreclr/src/mscorlib/src/System/Runtime/ExceptionServices/ExceptionServicesCommon.cs b/src/coreclr/src/mscorlib/src/System/Runtime/ExceptionServices/ExceptionServicesCommon.cs index 905f12d..e8eb691 100644 --- a/src/coreclr/src/mscorlib/src/System/Runtime/ExceptionServices/ExceptionServicesCommon.cs +++ b/src/coreclr/src/mscorlib/src/System/Runtime/ExceptionServices/ExceptionServicesCommon.cs @@ -15,7 +15,6 @@ ** =============================================================================*/ -#if FEATURE_EXCEPTIONDISPATCHINFO namespace System.Runtime.ExceptionServices { using System; @@ -132,4 +131,3 @@ namespace System.Runtime.ExceptionServices { } } } -#endif // FEATURE_EXCEPTIONDISPATCHINFO -- 2.7.4