Index: src/ia32/stub-cache-ia32.cc |
diff --git a/src/ia32/stub-cache-ia32.cc b/src/ia32/stub-cache-ia32.cc |
index 58f3708b186960e3bb4a787700240f3c7d515a25..d26210d69c0fe83fb7f1ed5550c8b070d21ed181 100644 |
--- a/src/ia32/stub-cache-ia32.cc |
+++ b/src/ia32/stub-cache-ia32.cc |
@@ -1342,14 +1342,14 @@ void StoreStubCompiler::HandlerFrontendFooter(Handle<Name> name, Label* miss) { |
Register LoadStubCompiler::CallbackHandlerFrontend( |
- Handle<Object> object, |
+ Handle<Type> type, |
Register object_reg, |
Handle<JSObject> holder, |
Handle<Name> name, |
Handle<Object> callback) { |
Label miss; |
- Register reg = HandlerFrontendHeader(object, object_reg, holder, name, &miss); |
+ Register reg = HandlerFrontendHeader(type, object_reg, holder, name, &miss); |
if (!holder->HasFastProperties() && !holder->IsJSGlobalObject()) { |
ASSERT(!reg.is(scratch2())); |
@@ -2952,7 +2952,8 @@ Handle<Code> StoreStubCompiler::CompileStoreCallback( |
Handle<JSObject> holder, |
Handle<Name> name, |
Handle<ExecutableAccessorInfo> callback) { |
- HandlerFrontend(object, receiver(), holder, name); |
+ HandlerFrontend(IC::CurrentTypeOf(object, isolate()), |
+ receiver(), holder, name); |
__ pop(scratch1()); // remove the return address |
__ push(receiver()); |
@@ -2976,7 +2977,8 @@ Handle<Code> StoreStubCompiler::CompileStoreCallback( |
Handle<JSObject> holder, |
Handle<Name> name, |
const CallOptimization& call_optimization) { |
- HandlerFrontend(object, receiver(), holder, name); |
+ HandlerFrontend(IC::CurrentTypeOf(object, isolate()), |
+ receiver(), holder, name); |
Register values[] = { value() }; |
GenerateFastApiCall( |
@@ -3083,12 +3085,10 @@ Handle<Code> KeyedStoreStubCompiler::CompileStorePolymorphic( |
} |
-Handle<Code> LoadStubCompiler::CompileLoadNonexistent( |
- Handle<Object> object, |
- Handle<JSObject> last, |
- Handle<Name> name, |
- Handle<JSGlobalObject> global) { |
- NonexistentHandlerFrontend(object, last, name, global); |
+Handle<Code> LoadStubCompiler::CompileLoadNonexistent(Handle<Type> type, |
+ Handle<JSObject> last, |
+ Handle<Name> name) { |
+ NonexistentHandlerFrontend(type, last, name); |
// Return undefined if maps of the full prototype chain are still the |
// same and no global property with this name contains a value. |
@@ -3179,14 +3179,14 @@ void LoadStubCompiler::GenerateLoadViaGetter(MacroAssembler* masm, |
Handle<Code> LoadStubCompiler::CompileLoadGlobal( |
- Handle<Object> object, |
+ Handle<Type> type, |
Handle<GlobalObject> global, |
Handle<PropertyCell> cell, |
Handle<Name> name, |
bool is_dont_delete) { |
Label miss; |
- HandlerFrontendHeader(object, receiver(), global, name, &miss); |
+ HandlerFrontendHeader(type, receiver(), global, name, &miss); |
// Get the value from the cell. |
if (Serializer::enabled()) { |
__ mov(eax, Immediate(cell)); |