1.1 --- a/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Fri Sep 06 20:16:09 2013 +0200
1.2 +++ b/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Thu Sep 12 13:51:13 2013 -0700
1.3 @@ -977,7 +977,9 @@
1.4
1.5 int SharedRuntime::c_calling_convention(const BasicType *sig_bt,
1.6 VMRegPair *regs,
1.7 + VMRegPair *regs2,
1.8 int total_args_passed) {
1.9 + assert(regs2 == NULL, "not needed on x86");
1.10 // We return the amount of VMRegImpl stack slots we need to reserve for all
1.11 // the arguments NOT counting out_preserve_stack_slots.
1.12
1.13 @@ -1624,7 +1626,7 @@
1.14 // Now figure out where the args must be stored and how much stack space
1.15 // they require.
1.16 int out_arg_slots;
1.17 - out_arg_slots = c_calling_convention(out_sig_bt, out_regs, total_c_args);
1.18 + out_arg_slots = c_calling_convention(out_sig_bt, out_regs, NULL, total_c_args);
1.19
1.20 // Compute framesize for the wrapper. We need to handlize all oops in
1.21 // registers a max of 2 on x86.
1.22 @@ -2495,7 +2497,7 @@
1.23 // they require (neglecting out_preserve_stack_slots).
1.24
1.25 int out_arg_slots;
1.26 - out_arg_slots = c_calling_convention(out_sig_bt, out_regs, total_c_args);
1.27 + out_arg_slots = c_calling_convention(out_sig_bt, out_regs, NULL, total_c_args);
1.28
1.29 // Calculate the total number of stack slots we will need.
1.30
