Remove catch ThreadAbortException (#39136)

dotnet · Jul 11, 2020 · 0f770d5 · 0f770d5
1 parent 5ea1b90
commit 0f770d5
Show file tree

Hide file tree

Showing 17 changed files with 0 additions and 98 deletions.
diff --git a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/Collection.vb b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/Collection.vb
@@ -99,8 +99,6 @@ Namespace Microsoft.VisualBasic
                 End If
             Catch ex As OutOfMemoryException
                 Throw
-            Catch ex As Threading.ThreadAbortException
-                Throw
             Catch ex As StackOverflowException
                 Throw
             Catch ex As Exception
@@ -234,8 +232,6 @@ Namespace Microsoft.VisualBasic
                         Throw ex
                     Catch ex As OutOfMemoryException
                         Throw ex
-                    Catch ex As System.Threading.ThreadAbortException
-                        Throw ex
                     Catch
                         Throw New ArgumentException(SR.Format(SR.Argument_InvalidValue1, NameOf(Index)), NameOf(Index))
                     End Try

diff --git a/...ries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/CompilerServices/Conversions.vb b/...ries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/CompilerServices/Conversions.vb
@@ -1918,8 +1918,6 @@ MisMatch:
                     Throw ex
                 Catch ex As OutOfMemoryException
                     Throw ex
-                Catch ex As Threading.ThreadAbortException
-                    Throw ex
                 Catch Ex As Exception
                     Return False
                 End Try

diff --git a/...aries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/CompilerServices/DoubleType.vb b/...aries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/CompilerServices/DoubleType.vb
@@ -177,8 +177,6 @@ ThrowInvalidCast:
                     Throw ex
                 Catch ex As OutOfMemoryException
                     Throw ex
-                Catch ex As System.Threading.ThreadAbortException
-                    Throw ex
                 Catch Ex As Exception
                     Return False
                 End Try

diff --git a/...ibraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/CompilerServices/IOUtils.vb b/...ibraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/CompilerServices/IOUtils.vb
@@ -72,8 +72,6 @@ Namespace Microsoft.VisualBasic.CompilerServices
                 Throw ex
             Catch ex As OutOfMemoryException
                 Throw ex
-            Catch ex As System.Threading.ThreadAbortException
-                Throw ex
             Catch
                 Return ""
             End Try

diff --git a/...ries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/CompilerServices/LateBinding.vb b/...ries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/CompilerServices/LateBinding.vb
@@ -149,8 +149,6 @@ Namespace Microsoft.VisualBasic.CompilerServices
                         Throw exInner
                     Catch exInner As OutOfMemoryException
                         Throw exInner
-                    Catch exInner As System.Threading.ThreadAbortException
-                        Throw exInner
                     Catch
                         oTmp = Nothing
                     End Try
@@ -421,8 +419,6 @@ Namespace Microsoft.VisualBasic.CompilerServices
                         Throw exInner
                     Catch exInner As OutOfMemoryException
                         Throw exInner
-                    Catch exInner As System.Threading.ThreadAbortException
-                        Throw exInner
                     Catch exInner As Exception
                         oTmp = Nothing
                     End Try
@@ -573,8 +569,6 @@ Namespace Microsoft.VisualBasic.CompilerServices
                             Throw ex
                         Catch ex As OutOfMemoryException
                             Throw ex
-                        Catch ex As System.Threading.ThreadAbortException
-                            Throw ex
                         Catch ex As Exception
                             ' If this assert is triggered due to an AccessViolationException,
                             ' report a bug to the CLR.
@@ -820,8 +814,6 @@ Namespace Microsoft.VisualBasic.CompilerServices
                             Throw ex
                         Catch ex As OutOfMemoryException
                             Throw ex
-                        Catch ex As System.Threading.ThreadAbortException
-                            Throw ex
                         Catch
                             ' If this assert is triggered because of an AccessViolation exception,
                             ' report a bug to the CLR.

diff --git a/...aries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/CompilerServices/ObjectType.vb b/...aries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/CompilerServices/ObjectType.vb
@@ -1011,8 +1011,6 @@ Namespace Microsoft.VisualBasic.CompilerServices
                         Throw ex
                     Catch ex As OutOfMemoryException
                         Throw ex
-                    Catch ex As System.Threading.ThreadAbortException
-                        Throw ex
                     Catch
                         DecimalResult = -conv.ToDecimal(Nothing)
                         GoTo DecimalExit
@@ -1033,8 +1031,6 @@ Namespace Microsoft.VisualBasic.CompilerServices
                         Throw ex
                     Catch ex As OutOfMemoryException
                         Throw ex
-                    Catch ex As System.Threading.ThreadAbortException
-                        Throw ex
                     Catch
                         DoubleResult = -conv.ToDouble(Nothing)
                         GoTo DoubleExit
@@ -2094,8 +2090,6 @@ DecimalExit:
                 Throw ex
             Catch ex As OutOfMemoryException
                 Throw ex
-            Catch ex As System.Threading.ThreadAbortException
-                Throw ex
             Catch 'e As OverflowException
                 Return CDec(i1) - CDec(i2)
             End Try
@@ -3285,8 +3279,6 @@ DecimalExit:
                     Throw ex
                 Catch ex As OutOfMemoryException
                     Throw ex
-                Catch ex As System.Threading.ThreadAbortException
-                    Throw ex
                 Catch
                     Throw GetNoValidOperatorException(conv1, conv2)
                 End Try
@@ -3303,8 +3295,6 @@ DecimalExit:
                     Throw ex
                 Catch ex As OutOfMemoryException
                     Throw ex
-                Catch ex As System.Threading.ThreadAbortException
-                    Throw ex
                 Catch
                     Throw GetNoValidOperatorException(conv1, conv2)
                 End Try

diff --git a/...aries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/CompilerServices/StringType.vb b/...aries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/CompilerServices/StringType.vb
@@ -739,8 +739,6 @@ Namespace Microsoft.VisualBasic.CompilerServices
                     Throw ex
                 Catch ex As OutOfMemoryException
                     Throw ex
-                Catch ex As System.Threading.ThreadAbortException
-                    Throw ex
                 Catch
                     Result = False
                 End Try

diff --git a/...Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/CompilerServices/Utils.LateBinder.vb b/...Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/CompilerServices/Utils.LateBinder.vb
@@ -79,8 +79,6 @@ Namespace Microsoft.VisualBasic.CompilerServices
                 Throw ex
             Catch ex As OutOfMemoryException
                 Throw ex
-            Catch ex As System.Threading.ThreadAbortException
-                Throw ex
             Catch
                 s = ResourceMsgDefault
             End Try
@@ -113,8 +111,6 @@ Namespace Microsoft.VisualBasic.CompilerServices
                 Throw ex
             Catch ex As OutOfMemoryException
                 Throw ex
-            Catch ex As System.Threading.ThreadAbortException
-                Throw ex
 
             Catch ex As Exception
                 System.Diagnostics.Debug.Fail("Unable to get and format string for ResourceKey: " & ResourceKey)
@@ -152,8 +148,6 @@ Namespace Microsoft.VisualBasic.CompilerServices
                 Throw ex
             Catch ex As OutOfMemoryException
                 Throw ex
-            Catch ex As System.Threading.ThreadAbortException
-                Throw ex
             Catch
                 'Ignore, should default to 0 values
             End Try

diff --git a/...ies/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/CompilerServices/VB6InputFile.vb b/...ies/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/CompilerServices/VB6InputFile.vb
@@ -44,8 +44,6 @@ Namespace Microsoft.VisualBasic.CompilerServices
                 Throw ex
             Catch ex As OutOfMemoryException
                 Throw ex
-            Catch ex As System.Threading.ThreadAbortException
-                Throw ex
             Catch ex As Exception
                 Throw VbMakeException(ex, vbErrors.PathNotFound)
             End Try
@@ -116,8 +114,6 @@ Namespace Microsoft.VisualBasic.CompilerServices
                         Throw ex
                     Catch ex As OutOfMemoryException
                         Throw ex
-                    Catch ex As System.Threading.ThreadAbortException
-                        Throw ex
                     Catch e As Exception
                     End Try
                 End If

diff --git a/...es/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/CompilerServices/VB6RandomFile.vb b/...es/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/CompilerServices/VB6RandomFile.vb
@@ -47,8 +47,6 @@ Namespace Microsoft.VisualBasic.CompilerServices
                 Throw ex
             Catch ex As OutOfMemoryException
                 Throw ex
-            Catch ex As System.Threading.ThreadAbortException
-                Throw ex
             Catch ex As Exception
                 Throw VbMakeException(vbErrors.InternalError)
             End Try
@@ -77,8 +75,6 @@ Namespace Microsoft.VisualBasic.CompilerServices
                     Throw ex
                 Catch ex As OutOfMemoryException
                     Throw ex
-                Catch ex As System.Threading.ThreadAbortException
-                    Throw ex
                 Catch
                     'Try Write access
                     m_access = OpenAccess.Write
@@ -88,8 +84,6 @@ Namespace Microsoft.VisualBasic.CompilerServices
                         Throw ex
                     Catch ex As OutOfMemoryException
                         Throw ex
-                    Catch ex As System.Threading.ThreadAbortException
-                        Throw ex
                     Catch
                         'If that failed, try read access
                         m_access = OpenAccess.Read

diff --git a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/Conversion.vb b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/Conversion.vb
@@ -519,8 +519,6 @@ RangeCheck:
                             Throw ex
                         Catch ex As OutOfMemoryException
                             Throw ex
-                        Catch ex As System.Threading.ThreadAbortException
-                            Throw ex
                         Catch
                             'Throw our own exception below
                         End Try
@@ -918,8 +916,6 @@ NextOctCharacter:
                     Throw ex
                 Catch ex As OutOfMemoryException
                     Throw ex
-                Catch ex As System.Threading.ThreadAbortException
-                    Throw ex
                 Catch
                     Throw VbMakeException(New ArgumentException(SR.Format(SR.Argument_InvalidValueType2, NameOf(Expression), VBFriendlyName(Expression))), vbErrors.OLENoPropOrMethod)
                 End Try

diff --git a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/DateAndTime.vb b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/DateAndTime.vb
@@ -58,8 +58,6 @@ Namespace Microsoft.VisualBasic
                     Throw ex
                 Catch ex As OutOfMemoryException
                     Throw ex
-                Catch ex As System.Threading.ThreadAbortException
-                    Throw ex
                 Catch
                     Throw VbMakeException(New InvalidCastException(SR.Format(SR.InvalidCast_FromStringTo, Left(Value, 32), "Date")), vbErrors.IllegalFuncCall)
                 End Try
@@ -109,8 +107,6 @@ Namespace Microsoft.VisualBasic
                     Throw ex
                 Catch ex As OutOfMemoryException
                     Throw ex
-                Catch ex As System.Threading.ThreadAbortException
-                    Throw ex
                 Catch
                     Throw VbMakeException(New InvalidCastException(SR.Format(SR.InvalidCast_FromStringTo, Left(Value, 32), "Date")), vbErrors.IllegalFuncCall)
                 End Try
@@ -286,8 +282,6 @@ Namespace Microsoft.VisualBasic
                 Throw ex
             Catch ex As OutOfMemoryException
                 Throw ex
-            Catch ex As System.Threading.ThreadAbortException
-                Throw ex
             Catch
                 Throw New InvalidCastException(SR.Format(SR.Argument_InvalidDateValue1, "DateValue"))
             End Try
@@ -309,8 +303,6 @@ Namespace Microsoft.VisualBasic
                 Throw ex
             Catch ex As OutOfMemoryException
                 Throw ex
-            Catch ex As System.Threading.ThreadAbortException
-                Throw ex
             Catch
                 Throw New InvalidCastException(SR.Format(SR.Argument_InvalidDateValue1, "Date1"))
             End Try
@@ -320,8 +312,6 @@ Namespace Microsoft.VisualBasic
                 Throw ex
             Catch ex As OutOfMemoryException
                 Throw ex
-            Catch ex As System.Threading.ThreadAbortException
-                Throw ex
             Catch
                 Throw New InvalidCastException(SR.Format(SR.Argument_InvalidDateValue1, "Date2"))
             End Try
@@ -341,8 +331,6 @@ Namespace Microsoft.VisualBasic
                 Throw ex
             Catch ex As OutOfMemoryException
                 Throw ex
-            Catch ex As System.Threading.ThreadAbortException
-                Throw ex
             Catch
                 Throw New InvalidCastException(SR.Format(SR.Argument_InvalidDateValue1, "DateValue"))
             End Try
@@ -416,8 +404,6 @@ Namespace Microsoft.VisualBasic
                 Throw ex
             Catch ex As OutOfMemoryException
                 Throw ex
-            Catch ex As System.Threading.ThreadAbortException
-                Throw ex
             Catch
                 Throw VbMakeException(New ArgumentException(SR.Format(SR.Argument_InvalidValue1, "Year")), vbErrors.IllegalFuncCall)
             End Try
@@ -428,8 +414,6 @@ Namespace Microsoft.VisualBasic
                 Throw ex
             Catch ex As OutOfMemoryException
                 Throw ex
-            Catch ex As System.Threading.ThreadAbortException
-                Throw ex
             Catch
                 Throw VbMakeException(New ArgumentException(SR.Format(SR.Argument_InvalidValue1, "Month")), vbErrors.IllegalFuncCall)
             End Try
@@ -440,8 +424,6 @@ Namespace Microsoft.VisualBasic
                 Throw ex
             Catch ex As OutOfMemoryException
                 Throw ex
-            Catch ex As System.Threading.ThreadAbortException
-                Throw ex
             Catch
                 Throw VbMakeException(New ArgumentException(SR.Format(SR.Argument_InvalidValue1, "Day")), vbErrors.IllegalFuncCall)
             End Try
@@ -569,8 +551,6 @@ Namespace Microsoft.VisualBasic
                 Throw ex
             Catch ex As OutOfMemoryException
                 Throw ex
-            Catch ex As System.Threading.ThreadAbortException
-                Throw ex
             Catch
                 Throw New ArgumentException(SR.Format(SR.Argument_InvalidValue1, "Weekday"))
             End Try

diff --git a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/FileSystem.vb b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/FileSystem.vb
@@ -221,8 +221,6 @@ Namespace Microsoft.VisualBasic
                 Throw ex
             Catch ex As OutOfMemoryException
                 Throw ex
-            Catch ex As System.Threading.ThreadAbortException
-                Throw ex
             Catch e2 As Exception
                 Throw VbMakeException(e2, vbErrors.PathFileAccess)
             End Try

diff --git a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/Financial.vb b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/Financial.vb
@@ -256,8 +256,6 @@ Namespace Microsoft.VisualBasic
                 Throw ex
             Catch ex As OutOfMemoryException
                 Throw ex
-            Catch ex As System.Threading.ThreadAbortException
-                Throw ex
             Catch
                 Throw New ArgumentException(SR.Format(SR.Argument_InvalidValue1, "ValueArray"))
             End Try

diff --git a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/Information.vb b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/Information.vb
@@ -324,8 +324,6 @@ Namespace Microsoft.VisualBasic
                     Throw ex
                 Catch ex As OutOfMemoryException
                     Throw ex
-                Catch ex As System.Threading.ThreadAbortException
-                    Throw ex
                 Catch
                     Return False
                 End Try

diff --git a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/Interaction.vb b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/Interaction.vb
@@ -395,8 +395,6 @@ Namespace Microsoft.VisualBasic
                 Throw ex
             Catch ex As OutOfMemoryException
                 Throw ex
-            Catch ex As System.Threading.ThreadAbortException
-                Throw ex
 
             Catch ex As Exception
                 'Consume the exception
@@ -531,8 +529,6 @@ Namespace Microsoft.VisualBasic
                 Throw ex
             Catch ex As OutOfMemoryException
                 Throw ex
-            Catch ex As System.Threading.ThreadAbortException
-                Throw ex
             Catch e As Exception
                 Throw VbMakeException(vbErrors.CantCreateObject)
             End Try
@@ -548,8 +544,6 @@ Namespace Microsoft.VisualBasic
                     Throw ex
                 Catch ex As OutOfMemoryException
                     Throw ex
-                Catch ex As System.Threading.ThreadAbortException
-                    Throw ex
                 Catch
                     Throw VbMakeException(vbErrors.CantCreateObject)
                 End Try
@@ -564,8 +558,6 @@ Namespace Microsoft.VisualBasic
                         Throw ex
                     Catch ex As OutOfMemoryException
                         Throw ex
-                    Catch ex As System.Threading.ThreadAbortException
-                        Throw ex
                     Catch
                         Throw VbMakeException(vbErrors.CantCreateObject)
                     End Try