Revert previous EntryPointNotFoundException; modify test

dotnet · Apr 3, 2022 · b667080 · b667080
1 parent 59ef825
commit b667080
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 18 deletions.
diff --git a/src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/DynamicMethod.cs b/src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/DynamicMethod.cs
@@ -588,11 +588,6 @@ Signature LazyCreateSignature()
                 {
                     return RuntimeMethodHandle.InvokeMethod(obj, (void**)arguments, Signature, isConstructor: false);
                 }
-                catch (EntryPointNotFoundException)
-                {
-                    // Don't wrap since the exception did not originate from within the method.
-                    throw;
-                }
                 catch (Exception e)
                 {
                     throw new TargetInvocationException(e);

diff --git a/src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeConstructorInfo.CoreCLR.cs b/src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeConstructorInfo.CoreCLR.cs
@@ -106,11 +106,6 @@ internal unsafe object InvokeNonEmitUnsafe(object? obj, IntPtr* args, Span<objec
                 {
                     return RuntimeMethodHandle.InvokeMethod(obj, (void**)args, Signature, isConstructor: obj is null)!;
                 }
-                catch (EntryPointNotFoundException)
-                {
-                    // Don't wrap since the exception did not originate from within the method.
-                    throw;
-                }
                 catch (Exception ex)
                 {
                     throw new TargetInvocationException(ex);

diff --git a/src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeMethodInfo.CoreCLR.cs b/src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeMethodInfo.CoreCLR.cs
@@ -378,11 +378,6 @@ public override MethodImplAttributes GetMethodImplementationFlags()
                 {
                     return RuntimeMethodHandle.InvokeMethod(obj, (void**)arguments, Signature, isConstructor: false);
                 }
-                catch (EntryPointNotFoundException)
-                {
-                    // Don't wrap since the exception did not originate from within the method.
-                    throw;
-                }
                 catch (Exception e)
                 {
                     throw new TargetInvocationException(e);

diff --git a/src/tests/reflection/DefaultInterfaceMethods/Emit.cs b/src/tests/reflection/DefaultInterfaceMethods/Emit.cs
@@ -117,7 +117,7 @@ static int Main()
             {
                 ifooType.GetMethod("DefaultMethod").Invoke(o, null);
             }
-            catch (EntryPointNotFoundException)
+            catch (TargetInvocationException ie) when (ie.InnerException is EntryPointNotFoundException)
             {
                 result |= 0x10;
             }
@@ -126,7 +126,7 @@ static int Main()
             {
                 ifooType.GetMethod("InterfaceMethod").Invoke(o, null);
             }
-            catch (EntryPointNotFoundException)
+            catch (TargetInvocationException ie) when (ie.InnerException is EntryPointNotFoundException)
             {
                 result |= 0x20;
             }

diff --git a/src/tests/reflection/DefaultInterfaceMethods/InvokeConsumer.cs b/src/tests/reflection/DefaultInterfaceMethods/InvokeConsumer.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using System.Reflection;
 
 class Program
 {
@@ -42,7 +43,7 @@ static int Main()
             typeof(IFoo).GetMethod("DefaultMethod").Invoke(new Reabstractor(), new object[] { 1 });
             return 501;
         }
-        catch (EntryPointNotFoundException)
+        catch (TargetInvocationException ie) when (ie.InnerException is EntryPointNotFoundException)
         {
         }