diff src/share/vm/c1/c1_FrameMap.cpp @ 17812:a7d4d4655766

Merge
author kvn
date Wed, 26 Mar 2014 18:21:05 -0700
parents a9becfeecd1b
children 4ca6dc0799b6
line wrap: on
line diff
--- a/src/share/vm/c1/c1_FrameMap.cpp	Mon Mar 24 10:48:44 2014 -0700
+++ b/src/share/vm/c1/c1_FrameMap.cpp	Wed Mar 26 18:21:05 2014 -0700
@@ -133,7 +133,7 @@
     }
   }
 
-  intptr_t out_preserve = SharedRuntime::c_calling_convention(sig_bt, regs, sizeargs);
+  intptr_t out_preserve = SharedRuntime::c_calling_convention(sig_bt, regs, NULL, sizeargs);
   LIR_OprList* args = new LIR_OprList(signature->length());
   for (i = 0; i < sizeargs;) {
     BasicType t = sig_bt[i];