From b667080ba2a8ac6874cea0ba97810e90e2ac9824 Mon Sep 17 00:00:00 2001
From: Steve Harter <steveharter@users.noreply.github.com>
Date: Sun, 3 Apr 2022 11:59:27 -0500
Subject: [PATCH] Revert previous EntryPointNotFoundException; modify test

---
 .../src/System/Reflection/Emit/DynamicMethod.cs              | 5 -----
 .../src/System/Reflection/RuntimeConstructorInfo.CoreCLR.cs  | 5 -----
 .../src/System/Reflection/RuntimeMethodInfo.CoreCLR.cs       | 5 -----
 src/tests/reflection/DefaultInterfaceMethods/Emit.cs         | 4 ++--
 .../reflection/DefaultInterfaceMethods/InvokeConsumer.cs     | 3 ++-
 5 files changed, 4 insertions(+), 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
index ea71e6919ff67..6b5e67602f90a 100644
--- 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
index d868f50fe16d6..35e14b8ebfee4 100644
--- 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
index 5c18e80b601e2..8cd33129735fd 100644
--- 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
index 029c941fcc122..2f54244151b55 100644
--- 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
index c74906775cb50..ad3c78ca7e0fb 100644
--- 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)
         {
         }