/hg/release/icedtea7-forest-2.2/jdk: 3 new changesets

[andrew at icedtea.classpath.org]

changeset 468ca19978a3 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=468ca19978a3
author: jrose
date: Thu Jan 10 19:22:29 2013 -0800

	8004933: Improve MethodHandle interaction with libraries
	8006017: Improve lookup resolutions
	Reviewed-by: ahgross


changeset 819c4d521119 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=819c4d521119
author: jrose
date: Fri Jan 11 17:53:41 2013 -0800

	8006125: Update MethodHandles library interactions
	Reviewed-by: mchung, jdn, ahgross


changeset 8fccb53fef83 in /hg/release/icedtea7-forest-2.2/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=8fccb53fef83
author: andrew
date: Mon Jan 14 22:54:05 2013 +0000

	Added tag icedtea-2.2.4 for changeset 819c4d521119


diffstat:

 .hgtags                                                     |   1 +
 src/share/classes/java/lang/invoke/MethodHandleNatives.java |  15 +++++++++++++
 src/share/classes/sun/reflect/misc/MethodUtil.java          |   6 +++++
 3 files changed, 22 insertions(+), 0 deletions(-)

diffs (49 lines):

diff -r 4cf358fd012a -r 8fccb53fef83 .hgtags
--- a/.hgtags	Tue Oct 16 21:31:13 2012 +0100
+++ b/.hgtags	Mon Jan 14 22:54:05 2013 +0000
@@ -181,3 +181,4 @@
 1870f7528cbf59c29224dab4ff84514aee20875e icedtea-2.2.1
 5ec35e1b30b02b11a13cbebaa8e23520c5ca89cc icedtea-2.2.2
 08baf77fec47a067341cf890a2e4c4a4917b9f09 icedtea-2.2.3
+819c4d5211199bf71811e69bde95b39434da384b icedtea-2.2.4
diff -r 4cf358fd012a -r 8fccb53fef83 src/share/classes/java/lang/invoke/MethodHandleNatives.java
--- a/src/share/classes/java/lang/invoke/MethodHandleNatives.java	Tue Oct 16 21:31:13 2012 +0100
+++ b/src/share/classes/java/lang/invoke/MethodHandleNatives.java	Mon Jan 14 22:54:05 2013 +0000
@@ -418,6 +418,21 @@
             return defc == sun.misc.Unsafe.class;
         case "lookup":
             return defc == java.lang.invoke.MethodHandles.class;
+        case "findStatic":
+        case "findVirtual":
+        case "findConstructor":
+        case "findSpecial":
+        case "findGetter":
+        case "findSetter":
+        case "findStaticGetter":
+        case "findStaticSetter":
+        case "bind":
+        case "unreflect":
+        case "unreflectSpecial":
+        case "unreflectConstructor":
+        case "unreflectGetter":
+        case "unreflectSetter":
+            return defc == java.lang.invoke.MethodHandles.Lookup.class;
         case "invoke":
             return defc == java.lang.reflect.Method.class;
         case "get":
diff -r 4cf358fd012a -r 8fccb53fef83 src/share/classes/sun/reflect/misc/MethodUtil.java
--- a/src/share/classes/sun/reflect/misc/MethodUtil.java	Tue Oct 16 21:31:13 2012 +0100
+++ b/src/share/classes/sun/reflect/misc/MethodUtil.java	Mon Jan 14 22:54:05 2013 +0000
@@ -256,6 +256,12 @@
     public static Object invoke(Method m, Object obj, Object[] params)
         throws InvocationTargetException, IllegalAccessException {
         if (m.getDeclaringClass().equals(AccessController.class) ||
+           (m.getDeclaringClass().equals(java.lang.invoke.MethodHandles.class)
+            && m.getName().equals("lookup")) ||
+           (m.getDeclaringClass().equals(java.lang.invoke.MethodHandles.Lookup.class)
+            && (m.getName().startsWith("find") ||
+                m.getName().startsWith("bind") ||
+                m.getName().startsWith("unreflect"))) ||
             m.getDeclaringClass().equals(Method.class))
             throw new InvocationTargetException(
                 new UnsupportedOperationException("invocation not supported"));