Chromium Code Reviews| Index: src/ia32/builtins-ia32.cc |
| diff --git a/src/ia32/builtins-ia32.cc b/src/ia32/builtins-ia32.cc |
| index db86549382dfb6f35538bdb852fcd51b1258472b..585dfe51b70bb840c83a792de31313b1ef91e376 100644 |
| --- a/src/ia32/builtins-ia32.cc |
| +++ b/src/ia32/builtins-ia32.cc |
| @@ -995,10 +995,12 @@ void Builtins::Generate_FunctionApply(MacroAssembler* masm) { |
| // Copy all arguments from the array to the stack. |
| Label entry, loop; |
| - __ mov(ecx, Operand(ebp, kIndexOffset)); |
| + Register receiver = LoadIC::ReceiverRegister(); |
| + Register key = LoadIC::NameRegister(); |
| + __ mov(key, Operand(ebp, kIndexOffset)); |
| __ jmp(&entry); |
| __ bind(&loop); |
| - __ mov(edx, Operand(ebp, kArgumentsOffset)); // load arguments |
| + __ mov(receiver, Operand(ebp, kArgumentsOffset)); // load arguments |
| // Use inline caching to speed up access to arguments. |
| Handle<Code> ic = masm->isolate()->builtins()->KeyedLoadIC_Initialize(); |
| @@ -1012,18 +1014,19 @@ void Builtins::Generate_FunctionApply(MacroAssembler* masm) { |
| __ push(eax); |
| // Update the index on the stack and in register eax. |
|
Jakob Kummerow
2014/06/26 16:17:10
nit: s/eax/|key|/
mvstanton
2014/06/30 13:19:09
Done.
|
| - __ mov(ecx, Operand(ebp, kIndexOffset)); |
| - __ add(ecx, Immediate(1 << kSmiTagSize)); |
| - __ mov(Operand(ebp, kIndexOffset), ecx); |
| + __ mov(key, Operand(ebp, kIndexOffset)); |
| + __ add(key, Immediate(1 << kSmiTagSize)); |
| + __ mov(Operand(ebp, kIndexOffset), key); |
| __ bind(&entry); |
| - __ cmp(ecx, Operand(ebp, kLimitOffset)); |
| + __ cmp(key, Operand(ebp, kLimitOffset)); |
| __ j(not_equal, &loop); |
| // Call the function. |
| Label call_proxy; |
| - __ mov(eax, ecx); |
| ParameterCount actual(eax); |
| + ASSERT(!key.is(eax)); |
|
Jakob Kummerow
2014/06/26 16:17:10
Here, too, consider using Move() instead.
mvstanton
2014/06/30 13:19:09
Done.
|
| + __ mov(eax, key); |
| __ SmiUntag(eax); |
| __ mov(edi, Operand(ebp, kFunctionOffset)); |
| __ CmpObjectType(edi, JS_FUNCTION_TYPE, ecx); |