Index: src/ic/mips/handler-compiler-mips.cc |
diff --git a/src/ic/mips/handler-compiler-mips.cc b/src/ic/mips/handler-compiler-mips.cc |
index f8ebc9407c825e22f6547d187a9106aa5ace3ca0..e058876442519d597d4db05d1edc2ec7e59ef3fa 100644 |
--- a/src/ic/mips/handler-compiler-mips.cc |
+++ b/src/ic/mips/handler-compiler-mips.cc |
@@ -92,6 +92,26 @@ void NamedStoreHandlerCompiler::GenerateStoreViaSetter( |
} |
+void PropertyHandlerCompiler::PushVectorAndSlot(Register vector, |
+ Register slot) { |
+ MacroAssembler* masm = this->masm(); |
+ __ Push(vector, slot); |
+} |
+ |
+ |
+void PropertyHandlerCompiler::PopVectorAndSlot(Register vector, Register slot) { |
+ MacroAssembler* masm = this->masm(); |
+ __ Pop(vector, slot); |
+} |
+ |
+ |
+void PropertyHandlerCompiler::DiscardVectorAndSlot() { |
+ MacroAssembler* masm = this->masm(); |
+ // Remove vector and slot. |
+ __ Addu(sp, sp, Operand(2 * kPointerSize)); |
+} |
+ |
+ |
void PropertyHandlerCompiler::GenerateDictionaryNegativeLookup( |
MacroAssembler* masm, Label* miss_label, Register receiver, |
Handle<Name> name, Register scratch0, Register scratch1) { |
@@ -481,6 +501,10 @@ void NamedLoadHandlerCompiler::FrontendFooter(Handle<Name> name, Label* miss) { |
Label success; |
__ Branch(&success); |
__ bind(miss); |
+ if (IC::ICUseVector(kind())) { |
+ DCHECK(kind() == Code::LOAD_IC); |
+ PopVectorAndSlot(); |
+ } |
TailCallBuiltin(masm(), MissBuiltin(kind())); |
__ bind(&success); |
} |
@@ -582,6 +606,7 @@ void NamedLoadHandlerCompiler::GenerateLoadInterceptorWithFollowup( |
} else { |
__ Push(holder_reg, this->name()); |
} |
+ InterceptorVectorSlotPush(holder_reg); |
// Invoke an interceptor. Note: map checks from receiver to |
// interceptor's holder has been compiled before (see a caller |
// of this method). |
@@ -598,6 +623,7 @@ void NamedLoadHandlerCompiler::GenerateLoadInterceptorWithFollowup( |
__ Ret(); |
__ bind(&interceptor_failed); |
+ InterceptorVectorSlotPop(holder_reg); |
if (must_preserve_receiver_reg) { |
__ Pop(receiver(), holder_reg, this->name()); |
} else { |
@@ -627,7 +653,7 @@ void NamedLoadHandlerCompiler::GenerateLoadInterceptor(Register holder_reg) { |
Handle<Code> NamedStoreHandlerCompiler::CompileStoreCallback( |
Handle<JSObject> object, Handle<Name> name, |
Handle<ExecutableAccessorInfo> callback) { |
- Register holder_reg = Frontend(receiver(), name); |
+ Register holder_reg = Frontend(name); |
__ Push(receiver(), holder_reg); // Receiver. |
__ li(at, Operand(callback)); // Callback info. |
@@ -667,6 +693,9 @@ Register NamedStoreHandlerCompiler::value() { |
Handle<Code> NamedLoadHandlerCompiler::CompileLoadGlobal( |
Handle<PropertyCell> cell, Handle<Name> name, bool is_configurable) { |
Label miss; |
+ if (IC::ICUseVector(kind())) { |
+ PushVectorAndSlot(); |
+ } |
FrontendHeader(receiver(), name, &miss); |
@@ -683,6 +712,9 @@ Handle<Code> NamedLoadHandlerCompiler::CompileLoadGlobal( |
Counters* counters = isolate()->counters(); |
__ IncrementCounter(counters->named_load_global_stub(), 1, a1, a3); |
+ if (IC::ICUseVector(kind())) { |
+ DiscardVectorAndSlot(); |
+ } |
__ Ret(USE_DELAY_SLOT); |
__ mov(v0, result); |