From 1d7bb1ffa0b80d2ef1cd991aa33f13c9b7c47dcc Mon Sep 17 00:00:00 2001
From: Mandy Chung <mchung@openjdk.org>
Date: Thu, 30 Mar 2023 16:07:47 +0000
Subject: [PATCH] 8304585: Method::invoke rewraps InvocationTargetException if
 a caller-sensitive method throws IAE

Reviewed-by: darcy, jpai, alanb
---
 .../reflect/DirectMethodHandleAccessor.java   |  8 +-
 .../Method/CallerSensitiveMethodInvoke.java   | 84 +++++++++++++++++++
 2 files changed, 86 insertions(+), 6 deletions(-)
 create mode 100644 test/jdk/java/lang/reflect/Method/CallerSensitiveMethodInvoke.java

diff --git a/src/java.base/share/classes/jdk/internal/reflect/DirectMethodHandleAccessor.java b/src/java.base/share/classes/jdk/internal/reflect/DirectMethodHandleAccessor.java
index 942d0cfa4f8..a1438bcc206 100644
--- a/src/java.base/share/classes/jdk/internal/reflect/DirectMethodHandleAccessor.java
+++ b/src/java.base/share/classes/jdk/internal/reflect/DirectMethodHandleAccessor.java
@@ -174,12 +174,8 @@ class DirectMethodHandleAccessor extends MethodAccessorImpl {
             // caller-sensitive method is invoked through a per-caller invoker while
             // the target MH is always spreading the args
             var invoker = JLIA.reflectiveInvoker(caller);
-            try {
-                // invoke the target method handle via an invoker
-                return invoker.invokeExact(target, obj, args);
-            } catch (IllegalArgumentException e) {
-                throw new InvocationTargetException(e);
-            }
+            // invoke the target method handle via an invoker
+            return invoker.invokeExact(target, obj, args);
         }
     }
 
diff --git a/test/jdk/java/lang/reflect/Method/CallerSensitiveMethodInvoke.java b/test/jdk/java/lang/reflect/Method/CallerSensitiveMethodInvoke.java
new file mode 100644
index 00000000000..a2b6b57796a
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Method/CallerSensitiveMethodInvoke.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8304585
+ * @run junit CallerSensitiveMethodInvoke
+ * @run junit/othervm -Djdk.reflect.useDirectMethodHandle=false CallerSensitiveMethodInvoke
+ * @summary Test Method::invoke that wraps exception in InvocationTargetException properly
+ */
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+public class CallerSensitiveMethodInvoke {
+    private int value = 10;
+
+    private void m() throws Exception {
+        throw new InvocationTargetException(new IllegalArgumentException("testing"));
+    }
+
+    /**
+     * Tests the Field::get method being invoked via Method::invoke which
+     * should throw InvocationTargetException thrown by Field::get.
+     */
+    @Test
+    public void csMethodInvoke() throws ReflectiveOperationException {
+        Field f = CallerSensitiveMethodInvoke.class.getDeclaredField("value");
+        try {
+            // Field::get throws IAE
+            Method m = Field.class.getDeclaredMethod("get", Object.class);
+            m.invoke(f, new Object());  // illegal receiver type. IAE thrown
+            fail("should not reach here");
+        } catch (InvocationTargetException e) {
+            Throwable t = e.getCause();
+            if (!(t instanceof IllegalArgumentException)) {
+                throw new RuntimeException("Unexpected cause of InvocationTargetException: " + t);
+            }
+        }
+    }
+
+    /**
+     * Tests the method being invoked throws InvocationTargetException which
+     * will be wrapped with another InvocationTargetException by Method::invoke.
+     */
+    @Test
+    public void methodInvoke() throws ReflectiveOperationException {
+        try {
+            // m() throws InvocationTargetException which will be wrapped by Method::invoke
+            Method m = CallerSensitiveMethodInvoke.class.getDeclaredMethod("m");
+            m.invoke(new CallerSensitiveMethodInvoke());
+            fail("should not reach here");
+        } catch (InvocationTargetException e) {
+            Throwable t = e.getCause();
+            if (!(t instanceof InvocationTargetException)) {
+                throw new RuntimeException("Unexpected cause of InvocationTargetException: " + t);
+            }
+        }
+    }
+}