infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-25 09:40:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

8147078: MethodHandles.catchException does not enforce Throwable subtype

Browse Source 
Reviewed-by: psandoz, sundar
This commit is contained in:
Michael Haupt 2016-01-14 13:53:13 +01:00
parent 751dd7f031
commit d64d6d8662
2 changed files with 85 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2016, 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
@ -3120,6 +3120,8 @@ assertEquals("boojum", (String) catTrace.invokeExact("boo", "jum"));
MethodHandle handler) {
MethodType ttype = target.type();
MethodType htype = handler.type();
if (!Throwable.class.isAssignableFrom(exType))
throw new ClassCastException(exType.getName());
if (htype.parameterCount() < 1 ||
!htype.parameterType(0).isAssignableFrom(exType))
throw newIllegalArgumentException("handler does not accept exception type "+exType);

82
jdk/test/java/lang/invoke/8147078/Test8147078.java Normal file
View File

@ -0,0 +1,82 @@
/*
* Copyright (c) 2016, 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. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* 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 8147078
* @run testng/othervm -ea -esa Test8147078
*/
import org.testng.annotations.Test;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import static java.lang.invoke.MethodType.methodType;
import static org.testng.AssertJUnit.*;
public class Test8147078 {
static int target(int x) {
throw new RuntimeException("ieps");
}
static int handler(String s, int x) {
return 4*x;
}
static final MethodHandle MH_target;
static final MethodHandle MH_handler;
static final MethodHandle MH_catchException;
static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
static {
try {
Class<Test8147078> C = Test8147078.class;
MH_target = LOOKUP.findStatic(C, "target", methodType(int.class, int.class));
MH_handler = LOOKUP.findStatic(C, "handler", methodType(int.class, String.class, int.class));
MH_catchException = LOOKUP.findStatic(MethodHandles.class, "catchException",
methodType(MethodHandle.class, MethodHandle.class, Class.class, MethodHandle.class));
} catch (Exception e) {
throw new ExceptionInInitializerError(e);
}
}
@Test
public void testNoExceptionType() {
boolean caught = false;
try {
MethodHandle eek = (MethodHandle) MH_catchException.invoke(MH_target, String.class, MH_handler);
} catch (ClassCastException cce) {
assertEquals("java.lang.String", cce.getMessage());
caught = true;
} catch (Throwable t) {
fail("unexpected exception caught: " + t);
}
assertTrue(caught);
}
}