From 6486a0cf2926efc27643e79d0cdba89ef980ab44 Mon Sep 17 00:00:00 2001
From: jfrijters <jfrijters>
Date: Mon, 8 Aug 2011 11:29:35 +0000
Subject: [PATCH] Special case reflective invocation of
 MethodHandle.invoke[Exact].

---
 openjdk/map.xml | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
diff --git a/openjdk/map.xml b/openjdk/map.xml
index 38fc5cda..016bac28 100644
--- a/openjdk/map.xml
+++ b/openjdk/map.xml
@@ -2764,6 +2764,46 @@
         <class name="java.lang.StackTraceElement">
             <attribute type="System.SerializableAttribute" sig="()V" />
         </class>
+        <class name="java.lang.invoke.MethodHandle">
+            <method name="invoke" sig="([Ljava.lang.Object;)Ljava.lang.Object;">
+                <attribute type="IKVM.Attributes.HideFromJavaAttribute" sig="()V" />
+            </method>
+            <method name="invokeExact" sig="([Ljava.lang.Object;)Ljava.lang.Object;">
+                <attribute type="IKVM.Attributes.HideFromJavaAttribute" sig="()V" />
+            </method>
+            <!-- NOTE Modifiers.Final and MethodAttributes.NewSlot is recognized by AotTypeWrapper.MapModifiers() as a magic combination that generates a non-virtual method -->
+            <method name="reflectionInvoke" sig="([Ljava.lang.Object;)Ljava.lang.Object;" modifiers="final" attributes="NewSlot">
+                <throws class="java.lang.Throwable" />
+                <attribute type="IKVM.Attributes.NameSigAttribute" sig="(Ljava.lang.String;Ljava.lang.String;)V">
+                    <parameter>invoke</parameter>
+                    <parameter>([Ljava.lang.Object;)Ljava.lang.Object;</parameter>
+                </attribute>
+                <attribute type="IKVM.Attributes.ModifiersAttribute" sig="(Lcli.IKVM.Attributes.Modifiers;)V">
+                    <parameter>Public,Final,Native</parameter>
+                </attribute>
+                <body>
+                    <ldstr value="MethodHandle.invoke cannot be invoked reflectively" />
+                    <newobj class="java.lang.UnsupportedOperationException" name="&lt;init&gt;" sig="(Ljava.lang.String;)V" />
+                    <throw />
+                </body>
+            </method>
+            <!-- NOTE Modifiers.Final and MethodAttributes.NewSlot is recognized by AotTypeWrapper.MapModifiers() as a magic combination that generates a non-virtual method -->
+            <method name="reflectionInvokeExact" sig="([Ljava.lang.Object;)Ljava.lang.Object;" modifiers="final" attributes="NewSlot">
+                <throws class="java.lang.Throwable" />
+                <attribute type="IKVM.Attributes.NameSigAttribute" sig="(Ljava.lang.String;Ljava.lang.String;)V">
+                    <parameter>invokeExact</parameter>
+                    <parameter>([Ljava.lang.Object;)Ljava.lang.Object;</parameter>
+                </attribute>
+                <attribute type="IKVM.Attributes.ModifiersAttribute" sig="(Lcli.IKVM.Attributes.Modifiers;)V">
+                    <parameter>Public,Final,Native</parameter>
+                </attribute>
+                <body>
+                    <ldstr value="MethodHandle.invokeExact cannot be invoked reflectively" />
+                    <newobj class="java.lang.UnsupportedOperationException" name="&lt;init&gt;" sig="(Ljava.lang.String;)V" />
+                    <throw />
+                </body>
+            </method>
+        </class>
         <class name="java.lang.invoke.MethodHandleImpl$AllocateObject">
             <method name="allocate" sig="()Ljava.lang.Object;">
                 <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
