*** old/src/share/vm/c1/c1_LIRGenerator.cpp	Tue Oct 22 21:20:48 2013
--- new/src/share/vm/c1/c1_LIRGenerator.cpp	Tue Oct 22 21:20:48 2013

*** 1173,1183 ****
--- 1173,1183 ----
  
  void LIRGenerator::do_Return(Return* x) {
    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);
      __ metadata2reg(method()->constant_encoding(), meth);
      args->append(meth);

*** 2718,2728 ****
--- 2718,2728 ----
    }
  
    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);
      __ metadata2reg(method()->constant_encoding(), meth);
      args->append(meth);

*** 3329,3339 ****
--- 3329,3339 ----
  void LIRGenerator::do_RuntimeCall(RuntimeCall* x) {
    LIR_OprList* args = new LIR_OprList(x->number_of_arguments());
    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());
    }
  
    for (int i = 0; i < x->number_of_arguments(); i++) {
      Value a = x->argument_at(i);