--- a/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp Wed Oct 23 12:40:23 2013 +0200
+++ b/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp Wed Oct 23 11:15:24 2013 -0700
@@ -1175,7 +1175,7 @@
if (compilation()->env()->dtrace_method_probes()) {
BasicTypeList signature;
signature.append(LP64_ONLY(T_LONG) NOT_LP64(T_INT)); // thread
- signature.append(T_OBJECT); // Method*
+ signature.append(T_METADATA); // Method*
LIR_OprList* args = new LIR_OprList();
args->append(getThreadPointer());
LIR_Opr meth = new_register(T_METADATA);
@@ -2720,7 +2720,7 @@
if (compilation()->env()->dtrace_method_probes()) {
BasicTypeList signature;
signature.append(LP64_ONLY(T_LONG) NOT_LP64(T_INT)); // thread
- signature.append(T_OBJECT); // Method*
+ signature.append(T_METADATA); // Method*
LIR_OprList* args = new LIR_OprList();
args->append(getThreadPointer());
LIR_Opr meth = new_register(T_METADATA);
@@ -3331,7 +3331,7 @@
BasicTypeList* signature = new BasicTypeList(x->number_of_arguments());
if (x->pass_thread()) {
- signature->append(T_ADDRESS);
+ signature->append(LP64_ONLY(T_LONG) NOT_LP64(T_INT)); // thread
args->append(getThreadPointer());
}