Index: src/ic/ic.cc |
diff --git a/src/ic/ic.cc b/src/ic/ic.cc |
index 73ac666a41c991bfef72c6996cda50787d4a1703..ca0913747426868db813544173d2eb0e87286669 100644 |
--- a/src/ic/ic.cc |
+++ b/src/ic/ic.cc |
@@ -976,12 +976,10 @@ bool IsCompatibleReceiver(LookupIterator* lookup, Handle<Map> receiver_map) { |
DCHECK(lookup->state() == LookupIterator::ACCESSOR); |
Isolate* isolate = lookup->isolate(); |
Handle<Object> accessors = lookup->GetAccessors(); |
- if (accessors->IsExecutableAccessorInfo()) { |
- Handle<ExecutableAccessorInfo> info = |
- Handle<ExecutableAccessorInfo>::cast(accessors); |
+ if (accessors->IsAccessorInfo()) { |
+ Handle<AccessorInfo> info = Handle<AccessorInfo>::cast(accessors); |
if (info->getter() != NULL && |
- !ExecutableAccessorInfo::IsCompatibleReceiverMap(isolate, info, |
- receiver_map)) { |
+ !AccessorInfo::IsCompatibleReceiverMap(isolate, info, receiver_map)) { |
return false; |
} |
} else if (accessors->IsAccessorPair()) { |
@@ -1169,12 +1167,10 @@ Handle<Code> LoadIC::CompileHandler(LookupIterator* lookup, |
} |
Handle<Object> accessors = lookup->GetAccessors(); |
- if (accessors->IsExecutableAccessorInfo()) { |
- Handle<ExecutableAccessorInfo> info = |
- Handle<ExecutableAccessorInfo>::cast(accessors); |
+ if (accessors->IsAccessorInfo()) { |
+ Handle<AccessorInfo> info = Handle<AccessorInfo>::cast(accessors); |
if (v8::ToCData<Address>(info->getter()) == 0) break; |
- if (!ExecutableAccessorInfo::IsCompatibleReceiverMap(isolate(), info, |
- map)) { |
+ if (!AccessorInfo::IsCompatibleReceiverMap(isolate(), info, map)) { |
// This case should be already handled in LoadIC::UpdateCaches. |
UNREACHABLE(); |
break; |
@@ -1733,9 +1729,8 @@ Handle<Code> StoreIC::CompileHandler(LookupIterator* lookup, |
break; |
} |
Handle<Object> accessors = lookup->GetAccessors(); |
- if (accessors->IsExecutableAccessorInfo()) { |
- Handle<ExecutableAccessorInfo> info = |
- Handle<ExecutableAccessorInfo>::cast(accessors); |
+ if (accessors->IsAccessorInfo()) { |
+ Handle<AccessorInfo> info = Handle<AccessorInfo>::cast(accessors); |
if (v8::ToCData<Address>(info->setter()) == 0) { |
TRACE_GENERIC_IC(isolate(), "StoreIC", "setter == 0"); |
break; |
@@ -1746,8 +1741,8 @@ Handle<Code> StoreIC::CompileHandler(LookupIterator* lookup, |
"special data property in prototype chain"); |
break; |
} |
- if (!ExecutableAccessorInfo::IsCompatibleReceiverMap(isolate(), info, |
- receiver_map())) { |
+ if (!AccessorInfo::IsCompatibleReceiverMap(isolate(), info, |
+ receiver_map())) { |
TRACE_GENERIC_IC(isolate(), "StoreIC", "incompatible receiver type"); |
break; |
} |
@@ -2820,11 +2815,10 @@ RUNTIME_FUNCTION(Runtime_StoreCallbackProperty) { |
Handle<Object> value = args.at<Object>(4); |
HandleScope scope(isolate); |
- Handle<ExecutableAccessorInfo> callback( |
+ Handle<AccessorInfo> callback( |
callback_or_cell->IsWeakCell() |
- ? ExecutableAccessorInfo::cast( |
- WeakCell::cast(*callback_or_cell)->value()) |
- : ExecutableAccessorInfo::cast(*callback_or_cell)); |
+ ? AccessorInfo::cast(WeakCell::cast(*callback_or_cell)->value()) |
+ : AccessorInfo::cast(*callback_or_cell)); |
DCHECK(callback->IsCompatibleReceiver(*receiver)); |