1.1 --- a/src/share/vm/prims/methodHandles.cpp Tue Feb 23 18:58:36 2016 -0500
1.2 +++ b/src/share/vm/prims/methodHandles.cpp Thu Jun 14 09:15:08 2018 -0700
1.3 @@ -1329,40 +1329,40 @@
1.4 #define LANG "Ljava/lang/"
1.5 #define JLINV "Ljava/lang/invoke/"
1.6
1.7 -#define OBJ LANG"Object;"
1.8 -#define CLS LANG"Class;"
1.9 -#define STRG LANG"String;"
1.10 -#define CS JLINV"CallSite;"
1.11 -#define MT JLINV"MethodType;"
1.12 -#define MH JLINV"MethodHandle;"
1.13 -#define MEM JLINV"MemberName;"
1.14 +#define OBJ LANG "Object;"
1.15 +#define CLS LANG "Class;"
1.16 +#define STRG LANG "String;"
1.17 +#define CS JLINV "CallSite;"
1.18 +#define MT JLINV "MethodType;"
1.19 +#define MH JLINV "MethodHandle;"
1.20 +#define MEM JLINV "MemberName;"
1.21
1.22 #define CC (char*) /*cast a literal from (const char*)*/
1.23 #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &f)
1.24
1.25 // These are the native methods on java.lang.invoke.MethodHandleNatives.
1.26 static JNINativeMethod MHN_methods[] = {
1.27 - {CC"init", CC"("MEM""OBJ")V", FN_PTR(MHN_init_Mem)},
1.28 - {CC"expand", CC"("MEM")V", FN_PTR(MHN_expand_Mem)},
1.29 - {CC"resolve", CC"("MEM""CLS")"MEM, FN_PTR(MHN_resolve_Mem)},
1.30 - {CC"getConstant", CC"(I)I", FN_PTR(MHN_getConstant)},
1.31 + {CC "init", CC "(" MEM "" OBJ ")V", FN_PTR(MHN_init_Mem)},
1.32 + {CC"expand", CC "(" MEM ")V", FN_PTR(MHN_expand_Mem)},
1.33 + {CC "resolve", CC "(" MEM "" CLS ")" MEM, FN_PTR(MHN_resolve_Mem)},
1.34 + {CC "getConstant", CC "(I)I", FN_PTR(MHN_getConstant)},
1.35 // static native int getNamedCon(int which, Object[] name)
1.36 - {CC"getNamedCon", CC"(I["OBJ")I", FN_PTR(MHN_getNamedCon)},
1.37 + {CC "getNamedCon", CC "(I[" OBJ ")I", FN_PTR(MHN_getNamedCon)},
1.38 // static native int getMembers(Class<?> defc, String matchName, String matchSig,
1.39 // int matchFlags, Class<?> caller, int skip, MemberName[] results);
1.40 - {CC"getMembers", CC"("CLS""STRG""STRG"I"CLS"I["MEM")I", FN_PTR(MHN_getMembers)},
1.41 - {CC"objectFieldOffset", CC"("MEM")J", FN_PTR(MHN_objectFieldOffset)},
1.42 - {CC"setCallSiteTargetNormal", CC"("CS""MH")V", FN_PTR(MHN_setCallSiteTargetNormal)},
1.43 - {CC"setCallSiteTargetVolatile", CC"("CS""MH")V", FN_PTR(MHN_setCallSiteTargetVolatile)},
1.44 - {CC"staticFieldOffset", CC"("MEM")J", FN_PTR(MHN_staticFieldOffset)},
1.45 - {CC"staticFieldBase", CC"("MEM")"OBJ, FN_PTR(MHN_staticFieldBase)},
1.46 - {CC"getMemberVMInfo", CC"("MEM")"OBJ, FN_PTR(MHN_getMemberVMInfo)}
1.47 + {CC "getMembers", CC "(" CLS "" STRG "" STRG "I" CLS "I[" MEM ")I", FN_PTR(MHN_getMembers)},
1.48 + {CC "objectFieldOffset", CC "(" MEM ")J", FN_PTR(MHN_objectFieldOffset)},
1.49 + {CC "setCallSiteTargetNormal", CC "(" CS "" MH ")V", FN_PTR(MHN_setCallSiteTargetNormal)},
1.50 + {CC "setCallSiteTargetVolatile", CC "(" CS "" MH ")V", FN_PTR(MHN_setCallSiteTargetVolatile)},
1.51 + {CC "staticFieldOffset", CC "(" MEM ")J", FN_PTR(MHN_staticFieldOffset)},
1.52 + {CC "staticFieldBase", CC "(" MEM ")" OBJ, FN_PTR(MHN_staticFieldBase)},
1.53 + {CC "getMemberVMInfo", CC "(" MEM ")" OBJ, FN_PTR(MHN_getMemberVMInfo)}
1.54 };
1.55
1.56 static JNINativeMethod MH_methods[] = {
1.57 // UnsupportedOperationException throwers
1.58 - {CC"invoke", CC"(["OBJ")"OBJ, FN_PTR(MH_invoke_UOE)},
1.59 - {CC"invokeExact", CC"(["OBJ")"OBJ, FN_PTR(MH_invokeExact_UOE)}
1.60 + {CC "invoke", CC "([" OBJ ")" OBJ, FN_PTR(MH_invoke_UOE)},
1.61 + {CC "invokeExact", CC "([" OBJ ")" OBJ, FN_PTR(MH_invokeExact_UOE)}
1.62 };
1.63
1.64 /**
