indy: restore dropped change
authorjrose
Tue Sep 02 00:08:13 2008 -0700 (14 months ago)
changeset 2431eb9efc095b
parent 2395a6aca2791b
child 25e65430d0399f
indy: restore dropped change
indy.patch
--- a/indy.patch Mon Sep 01 22:35:12 2008 -0700
+++ b/indy.patch Tue Sep 02 00:08:13 2008 -0700
@@ -2145,7 +2145,7 @@ diff --git a/src/share/vm/interpreter/in
diff --git a/src/share/vm/interpreter/interpreterRuntime.cpp b/src/share/vm/interpreter/interpreterRuntime.cpp
--- a/src/share/vm/interpreter/interpreterRuntime.cpp
+++ b/src/share/vm/interpreter/interpreterRuntime.cpp
-@@ -683,6 +683,131 @@
+@@ -684,6 +684,131 @@
info.vtable_index());
}
IRT_END
@@ -3701,6 +3701,24 @@ diff --git a/src/share/vm/prims/methodHa
/// JVM_RegisterMethodHandleMethods
#define ADR "J"
+@@ -630,6 +640,7 @@
+ #define DMH DYNI"DMH;"
+ #define MT DYNP"MethodType;"
+ #define MTFM DYNI"MTForm;"
++#define DCST DYNI"DynCallSite;"
+
+ #define CC (char*) /*cast a literal from (const char*)*/
+ #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &f)
+@@ -641,7 +652,8 @@
+ {CC"init", CC"("DMH OBJ"Z)V", FN_PTR(MH_init_DMH)},
+ {CC"init", CC"("MTFM MT")V", FN_PTR(MH_init_MTForm)},
+ {CC"getMethodName", CC"("MH")"STRG, FN_PTR(MH_methodName)},
+- {CC"getVMRef", CC"("MH")"OBJ, FN_PTR(MH_vmref)}
++ {CC"getVMRef", CC"("MH")"OBJ, FN_PTR(MH_vmref)},
++ {CC"linkCallSite", CC"("DCST MH")V", FN_PTR(MH_linkCallSite)}
+ };
+
+
diff --git a/src/share/vm/runtime/arguments.cpp b/src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp
+++ b/src/share/vm/runtime/arguments.cpp