Mercurial > hg > shark > hotspot
changeset 2219:708dc2722042
Consistency
| author | Gary Benson <gbenson@redhat.com> |
|---|---|
| date | Wed, 16 Feb 2011 10:44:41 +0000 |
| parents | 931f823c1500 |
| children | 35b11ba82a71 |
| files | src/cpu/zero/vm/cppInterpreter_zero.cpp |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cpu/zero/vm/cppInterpreter_zero.cpp Wed Feb 16 10:44:22 2011 +0000 +++ b/src/cpu/zero/vm/cppInterpreter_zero.cpp Wed Feb 16 10:44:41 2011 +0000 @@ -614,8 +614,8 @@ intptr_t UNUSED, TRAPS) { JavaThread *thread = (JavaThread *) THREAD; ZeroStack *stack = thread->zero_stack(); - int num_locals = method->size_of_parameters(); - intptr_t *locals = stack->sp() + (num_locals - 1); + int max_locals = method->size_of_parameters(); + intptr_t *locals = stack->sp() + (max_locals - 1); // Get the MethodType address p = (address) method; @@ -628,7 +628,7 @@ oop mtform = java_dyn_MethodType::form(method_type); int vmslots = java_dyn_MethodTypeForm::vmslots(mtform); vmslots--; // XXX why why why? - assert(vmslots >= 0 && vmslots < num_locals, "should be"); + assert(vmslots >= 0 && vmslots < max_locals, "should be"); oop method_handle = LOCALS_OBJECT(vmslots); // Compare the method type against that of the receiver @@ -678,7 +678,7 @@ if (HAS_PENDING_EXCEPTION) break; stack->alloc(arg_slots * wordSize); - num_locals += arg_slots; + max_locals += arg_slots; // Shuffle everything up Unimplemented();