Index: src/arm/macro-assembler-arm.cc |
=================================================================== |
--- src/arm/macro-assembler-arm.cc (revision 5232) |
+++ src/arm/macro-assembler-arm.cc (working copy) |
@@ -757,7 +757,7 @@ |
SharedFunctionInfo::kFormalParameterCountOffset)); |
mov(expected_reg, Operand(expected_reg, ASR, kSmiTagSize)); |
ldr(code_reg, |
- MemOperand(code_reg, SharedFunctionInfo::kCodeOffset - kHeapObjectTag)); |
+ MemOperand(r1, JSFunction::kCodeOffset - kHeapObjectTag)); |
add(code_reg, code_reg, Operand(Code::kHeaderSize - kHeapObjectTag)); |
ParameterCount expected(expected_reg); |
@@ -1508,8 +1508,7 @@ |
// Make sure the code objects in the builtins object and in the |
// builtin function are the same. |
push(r1); |
- ldr(r1, FieldMemOperand(r1, JSFunction::kSharedFunctionInfoOffset)); |
- ldr(r1, FieldMemOperand(r1, SharedFunctionInfo::kCodeOffset)); |
+ ldr(r1, FieldMemOperand(r1, JSFunction::kCodeOffset)); |
cmp(r1, target); |
Assert(eq, "Builtin code object changed"); |
pop(r1); |