Index: src/ic/arm/handler-compiler-arm.cc |
diff --git a/src/ic/arm/handler-compiler-arm.cc b/src/ic/arm/handler-compiler-arm.cc |
index 4ed765e73f18cb29c3223f3e6edf016d99be5619..af27b2364f99460c88a01af57e66ca03c34f819b 100644 |
--- a/src/ic/arm/handler-compiler-arm.cc |
+++ b/src/ic/arm/handler-compiler-arm.cc |
@@ -111,15 +111,21 @@ void NamedStoreHandlerCompiler::GenerateStoreViaSetter( |
void PropertyHandlerCompiler::PushVectorAndSlot(Register vector, |
Register slot) { |
MacroAssembler* masm = this->masm(); |
- __ push(vector); |
+ STATIC_ASSERT(LoadWithVectorDescriptor::kSlot < |
+ LoadWithVectorDescriptor::kVector); |
+ STATIC_ASSERT(StoreWithVectorDescriptor::kSlot < |
+ StoreWithVectorDescriptor::kVector); |
+ STATIC_ASSERT(StoreTransitionDescriptor::kSlot < |
+ StoreTransitionDescriptor::kVector); |
__ push(slot); |
+ __ push(vector); |
} |
void PropertyHandlerCompiler::PopVectorAndSlot(Register vector, Register slot) { |
MacroAssembler* masm = this->masm(); |
- __ pop(slot); |
__ pop(vector); |
+ __ pop(slot); |
} |
@@ -129,6 +135,9 @@ void PropertyHandlerCompiler::DiscardVectorAndSlot() { |
__ add(sp, sp, Operand(2 * kPointerSize)); |
} |
+void PropertyHandlerCompiler::PushReturnAddress(Register tmp) { UNREACHABLE(); } |
+ |
+void PropertyHandlerCompiler::PopReturnAddress(Register tmp) { UNREACHABLE(); } |
void PropertyHandlerCompiler::GenerateDictionaryNegativeLookup( |
MacroAssembler* masm, Label* miss_label, Register receiver, |
@@ -366,12 +375,6 @@ void NamedStoreHandlerCompiler::GenerateRestoreName(Handle<Name> name) { |
} |
-void NamedStoreHandlerCompiler::RearrangeVectorAndSlot( |
- Register current_map, Register destination_map) { |
- DCHECK(false); // Not implemented. |
-} |
- |
- |
void NamedStoreHandlerCompiler::GenerateRestoreMap(Handle<Map> transition, |
Register map_reg, |
Register scratch, |