Index: src/ic/ia32/handler-compiler-ia32.cc |
diff --git a/src/ic/ia32/handler-compiler-ia32.cc b/src/ic/ia32/handler-compiler-ia32.cc |
index 0e1ba7572c0262f6a24b970ab7ec93697906bea4..9383e13df3c75196fa6b0541b2a7d4565186cea4 100644 |
--- a/src/ic/ia32/handler-compiler-ia32.cc |
+++ b/src/ic/ia32/handler-compiler-ia32.cc |
@@ -594,29 +594,23 @@ |
void NamedLoadHandlerCompiler::GenerateLoadCallback( |
Register reg, Handle<AccessorInfo> callback) { |
- DCHECK(!AreAliased(scratch2(), scratch3(), receiver())); |
- DCHECK(!AreAliased(scratch2(), scratch3(), reg)); |
- |
// Insert additional parameters into the stack frame above return address. |
+ DCHECK(!scratch3().is(reg)); |
__ pop(scratch3()); // Get return address to place it below. |
- // Build v8::PropertyCallbackInfo::args_ array on the stack and push property |
- // name below the exit frame to make GC aware of them. |
- STATIC_ASSERT(PropertyCallbackArguments::kShouldThrowOnErrorIndex == 0); |
- STATIC_ASSERT(PropertyCallbackArguments::kHolderIndex == 1); |
- STATIC_ASSERT(PropertyCallbackArguments::kIsolateIndex == 2); |
- STATIC_ASSERT(PropertyCallbackArguments::kReturnValueDefaultValueIndex == 3); |
- STATIC_ASSERT(PropertyCallbackArguments::kReturnValueOffset == 4); |
- STATIC_ASSERT(PropertyCallbackArguments::kDataIndex == 5); |
- STATIC_ASSERT(PropertyCallbackArguments::kThisIndex == 6); |
- STATIC_ASSERT(PropertyCallbackArguments::kArgsLength == 7); |
- |
+ STATIC_ASSERT(PropertyCallbackArguments::kHolderIndex == 0); |
+ STATIC_ASSERT(PropertyCallbackArguments::kIsolateIndex == 1); |
+ STATIC_ASSERT(PropertyCallbackArguments::kReturnValueDefaultValueIndex == 2); |
+ STATIC_ASSERT(PropertyCallbackArguments::kReturnValueOffset == 3); |
+ STATIC_ASSERT(PropertyCallbackArguments::kDataIndex == 4); |
+ STATIC_ASSERT(PropertyCallbackArguments::kThisIndex == 5); |
__ push(receiver()); // receiver |
// Push data from AccessorInfo. |
Handle<Object> data(callback->data(), isolate()); |
if (data->IsUndefined() || data->IsSmi()) { |
__ push(Immediate(data)); |
} else { |
+ DCHECK(!scratch2().is(reg)); |
Handle<WeakCell> cell = |
isolate()->factory()->NewWeakCell(Handle<HeapObject>::cast(data)); |
// The callback is alive if this instruction is executed, |
@@ -629,9 +623,13 @@ |
__ push(Immediate(isolate()->factory()->undefined_value())); |
__ push(Immediate(reinterpret_cast<int>(isolate()))); |
__ push(reg); // holder |
- __ push(Immediate(Smi::FromInt(0))); // should_throw_on_error -> false |
+ |
+ // Save a pointer to where we pushed the arguments. This will be |
+ // passed as the const PropertyAccessorInfo& to the C++ callback. |
+ __ push(esp); |
__ push(name()); // name |
+ |
__ push(scratch3()); // Restore return address. |
// Abi for CallApiGetter |
@@ -733,8 +731,7 @@ |
Handle<Code> NamedStoreHandlerCompiler::CompileStoreCallback( |
- Handle<JSObject> object, Handle<Name> name, Handle<AccessorInfo> callback, |
- LanguageMode language_mode) { |
+ Handle<JSObject> object, Handle<Name> name, Handle<AccessorInfo> callback) { |
Register holder_reg = Frontend(name); |
__ pop(scratch1()); // remove the return address |
@@ -750,7 +747,6 @@ |
} |
__ Push(name); |
__ push(value()); |
- __ push(Immediate(Smi::FromInt(language_mode))); |
__ push(scratch1()); // restore return address |
// Do tail-call to the runtime system. |