Revision: 23349
Author: [email protected]
Date: Mon Aug 25 11:34:43 2014 UTC
Log: Clean up LookupIterator::Configuration naming
BUG=
[email protected]
Review URL: https://codereview.chromium.org/503663003
https://code.google.com/p/v8/source/detail?r=23349
Modified:
/branches/bleeding_edge/src/api.cc
/branches/bleeding_edge/src/bootstrapper.cc
/branches/bleeding_edge/src/factory.cc
/branches/bleeding_edge/src/hydrogen.cc
/branches/bleeding_edge/src/ic/ic.cc
/branches/bleeding_edge/src/isolate.cc
/branches/bleeding_edge/src/json-stringifier.h
/branches/bleeding_edge/src/lookup-inl.h
/branches/bleeding_edge/src/lookup.cc
/branches/bleeding_edge/src/lookup.h
/branches/bleeding_edge/src/objects.cc
/branches/bleeding_edge/src/runtime.cc
/branches/bleeding_edge/test/cctest/test-api.cc
=======================================
--- /branches/bleeding_edge/src/api.cc Mon Aug 25 08:56:31 2014 UTC
+++ /branches/bleeding_edge/src/api.cc Mon Aug 25 11:34:43 2014 UTC
@@ -3610,7 +3610,7 @@
i::PrototypeIterator iter(isolate, self_obj);
if (iter.IsAtEnd()) return Local<Value>();
i::LookupIterator it(i::PrototypeIterator::GetCurrent(iter), key_obj,
- i::LookupIterator::CHECK_DERIVED_PROPERTY);
+ i::LookupIterator::PROTOTYPE_CHAIN_PROPERTY);
return GetPropertyByLookup(&it);
}
@@ -3623,7 +3623,7 @@
i::Handle<i::JSObject> self_obj = Utils::OpenHandle(this);
i::Handle<i::String> key_obj = Utils::OpenHandle(*key);
i::LookupIterator it(self_obj, key_obj,
- i::LookupIterator::CHECK_DERIVED_PROPERTY);
+ i::LookupIterator::PROTOTYPE_CHAIN_PROPERTY);
return GetPropertyByLookup(&it);
}
=======================================
--- /branches/bleeding_edge/src/bootstrapper.cc Mon Aug 25 09:12:22 2014 UTC
+++ /branches/bleeding_edge/src/bootstrapper.cc Mon Aug 25 11:34:43 2014 UTC
@@ -780,7 +780,7 @@
name, code, prototype, JS_GLOBAL_OBJECT_TYPE,
JSGlobalObject::kSize);
#ifdef DEBUG
LookupIterator it(prototype, factory()->constructor_string(),
- LookupIterator::CHECK_PROPERTY);
+ LookupIterator::OWN_PROPERTY);
Handle<Object> value = JSReceiver::GetProperty(&it).ToHandleChecked();
DCHECK(it.IsFound());
DCHECK_EQ(*isolate()->object_function(), *value);
@@ -2480,7 +2480,7 @@
}
case CALLBACKS: {
Handle<Name> key(descs->GetKey(i));
- LookupIterator it(to, key, LookupIterator::CHECK_PROPERTY);
+ LookupIterator it(to, key, LookupIterator::OWN_PROPERTY);
// If the property is already there we skip it
if (it.IsFound() && it.HasProperty()) continue;
HandleScope inner(isolate());
@@ -2511,7 +2511,7 @@
DCHECK(raw_key->IsName());
// If the property is already there we skip it.
Handle<Name> key(Name::cast(raw_key));
- LookupIterator it(to, key, LookupIterator::CHECK_PROPERTY);
+ LookupIterator it(to, key, LookupIterator::OWN_PROPERTY);
if (it.IsFound() && it.HasProperty()) continue;
// Set the property.
Handle<Object> value = Handle<Object>(properties->ValueAt(i),
=======================================
--- /branches/bleeding_edge/src/factory.cc Tue Aug 19 08:53:38 2014 UTC
+++ /branches/bleeding_edge/src/factory.cc Mon Aug 25 11:34:43 2014 UTC
@@ -2174,7 +2174,7 @@
if (prototype->IsTheHole()) {
#ifdef DEBUG
LookupIterator it(handle(JSObject::cast(result->prototype())),
- constructor_string(),
LookupIterator::CHECK_PROPERTY);
+ constructor_string(), LookupIterator::OWN_PROPERTY);
MaybeHandle<Object> maybe_prop = Object::GetProperty(&it);
DCHECK(it.IsFound());
DCHECK(maybe_prop.ToHandleChecked().is_identical_to(result));
=======================================
--- /branches/bleeding_edge/src/hydrogen.cc Fri Aug 22 14:36:54 2014 UTC
+++ /branches/bleeding_edge/src/hydrogen.cc Mon Aug 25 11:34:43 2014 UTC
@@ -5341,8 +5341,7 @@
}
Handle<GlobalObject> global(current_info()->global_object());
- LookupIterator it(global, variable->name(),
- LookupIterator::CHECK_PROPERTY);
+ LookupIterator it(global, variable->name(),
LookupIterator::OWN_PROPERTY);
GlobalPropertyAccess type = LookupGlobalProperty(variable, &it,
LOAD);
if (type == kUseCell &&
@@ -5797,7 +5796,7 @@
HConstant::cast(checked_object->ActualValue())->handle(isolate()));
if (object->IsJSObject()) {
- LookupIterator it(object, info->name(),
LookupIterator::CHECK_PROPERTY);
+ LookupIterator it(object, info->name(),
LookupIterator::OWN_PROPERTY);
Handle<Object> value = JSObject::GetDataProperty(&it);
CHECK(it.IsFound());
return New<HConstant>(value);
@@ -6463,7 +6462,7 @@
HValue* value,
BailoutId ast_id) {
Handle<GlobalObject> global(current_info()->global_object());
- LookupIterator it(global, var->name(), LookupIterator::CHECK_PROPERTY);
+ LookupIterator it(global, var->name(), LookupIterator::OWN_PROPERTY);
GlobalPropertyAccess type = LookupGlobalProperty(var, &it, STORE);
if (type == kUseCell) {
Handle<PropertyCell> cell = it.GetPropertyCell();
@@ -9055,7 +9054,7 @@
// access check is not enabled we assume that the function will not
change
// and generate optimized code for calling the function.
Handle<GlobalObject> global(current_info()->global_object());
- LookupIterator it(global, var->name(),
LookupIterator::CHECK_PROPERTY);
+ LookupIterator it(global, var->name(), LookupIterator::OWN_PROPERTY);
GlobalPropertyAccess type = LookupGlobalProperty(var, &it, LOAD);
if (type == kUseCell &&
!current_info()->global_object()->IsAccessCheckNeeded()) {
@@ -10699,7 +10698,7 @@
!current_info()->global_object()->IsAccessCheckNeeded()) {
Handle<String> name = proxy->name();
Handle<GlobalObject> global(current_info()->global_object());
- LookupIterator it(global, name, LookupIterator::CHECK_PROPERTY);
+ LookupIterator it(global, name, LookupIterator::OWN_PROPERTY);
Handle<Object> value = JSObject::GetDataProperty(&it);
if (it.IsFound() && value->IsJSFunction()) {
Handle<JSFunction> candidate = Handle<JSFunction>::cast(value);
=======================================
--- /branches/bleeding_edge/src/ic/ic.cc Mon Aug 25 11:31:38 2014 UTC
+++ /branches/bleeding_edge/src/ic/ic.cc Mon Aug 25 11:34:43 2014 UTC
@@ -282,7 +282,7 @@
if (receiver->IsGlobalObject()) {
Handle<GlobalObject> global = Handle<GlobalObject>::cast(receiver);
- LookupIterator it(global, name, LookupIterator::CHECK_PROPERTY);
+ LookupIterator it(global, name, LookupIterator::OWN_PROPERTY);
if (!it.IsFound() || !it.HasProperty()) return false;
Handle<PropertyCell> cell = it.GetPropertyCell();
return cell->type()->IsConstant();
=======================================
--- /branches/bleeding_edge/src/isolate.cc Fri Aug 22 11:43:39 2014 UTC
+++ /branches/bleeding_edge/src/isolate.cc Mon Aug 25 11:34:43 2014 UTC
@@ -1057,7 +1057,7 @@
// probably not a valid Error object. In that case, we fall
through
// and capture the stack trace at this throw site.
LookupIterator lookup(exception_handle, key,
- LookupIterator::CHECK_PROPERTY);
+ LookupIterator::OWN_PROPERTY);
Handle<Object> stack_trace_property;
if (Object::GetProperty(&lookup).ToHandle(&stack_trace_property)
&&
stack_trace_property->IsJSArray()) {
=======================================
--- /branches/bleeding_edge/src/json-stringifier.h Mon Aug 18 14:59:04 2014
UTC
+++ /branches/bleeding_edge/src/json-stringifier.h Mon Aug 25 11:34:43 2014
UTC
@@ -340,7 +340,7 @@
MaybeHandle<Object> BasicJsonStringifier::ApplyToJsonFunction(
Handle<Object> object, Handle<Object> key) {
LookupIterator it(object, tojson_string_,
- LookupIterator::CHECK_DERIVED_SKIP_INTERCEPTOR);
+ LookupIterator::PROTOTYPE_CHAIN_SKIP_INTERCEPTOR);
Handle<Object> fun;
ASSIGN_RETURN_ON_EXCEPTION(isolate_, fun, Object::GetProperty(&it),
Object);
if (!fun->IsJSFunction()) return object;
=======================================
--- /branches/bleeding_edge/src/lookup-inl.h Fri Aug 22 11:38:21 2014 UTC
+++ /branches/bleeding_edge/src/lookup-inl.h Mon Aug 25 11:34:43 2014 UTC
@@ -19,7 +19,7 @@
DCHECK(!next->map()->IsGlobalObjectMap() ||
next->map()->is_hidden_prototype());
- if (!check_derived() &&
+ if (!check_prototype_chain() &&
!(check_hidden() && next->map()->is_hidden_prototype()) &&
// Always lookup behind the JSGlobalProxy into the JSGlobalObject,
even
// when not checking other hidden prototypes.
=======================================
--- /branches/bleeding_edge/src/lookup.cc Mon Aug 25 11:31:38 2014 UTC
+++ /branches/bleeding_edge/src/lookup.cc Mon Aug 25 11:34:43 2014 UTC
@@ -252,7 +252,7 @@
bool LookupIterator::HolderIsReceiverOrHiddenPrototype() const {
DCHECK(has_property_ || state_ == INTERCEPTOR || state_ == JSPROXY);
// Optimization that only works if configuration_ is not mutable.
- if (!check_derived()) return true;
+ if (!check_prototype_chain()) return true;
DisallowHeapAllocation no_gc;
Handle<Object> receiver = GetReceiver();
if (!receiver->IsJSReceiver()) return false;
=======================================
--- /branches/bleeding_edge/src/lookup.h Mon Aug 25 11:31:38 2014 UTC
+++ /branches/bleeding_edge/src/lookup.h Mon Aug 25 11:34:43 2014 UTC
@@ -16,19 +16,21 @@
public:
enum Configuration {
// Configuration bits.
- CHECK_HIDDEN_PROPERTY = 1 << 0,
- CHECK_DERIVED_PROPERTY = 1 << 1,
- CHECK_INTERCEPTOR = 1 << 2,
- CHECK_ACCESS_CHECK = 1 << 3,
+ kAccessCheck = 1 << 0,
+ kHidden = 1 << 1,
+ kInterceptor = 1 << 2,
+ kPrototypeChain = 1 << 3,
// Convience combinations of bits.
- CHECK_PROPERTY = 0,
- CHECK_OWN = CHECK_ACCESS_CHECK | CHECK_INTERCEPTOR,
- CHECK_HIDDEN_SKIP_INTERCEPTOR = CHECK_HIDDEN_PROPERTY |
CHECK_ACCESS_CHECK,
- CHECK_DERIVED_SKIP_INTERCEPTOR =
- CHECK_HIDDEN_SKIP_INTERCEPTOR | CHECK_DERIVED_PROPERTY,
- CHECK_DERIVED = CHECK_DERIVED_SKIP_INTERCEPTOR | CHECK_INTERCEPTOR,
- CHECK_HIDDEN = CHECK_HIDDEN_SKIP_INTERCEPTOR | CHECK_INTERCEPTOR
+ OWN_PROPERTY = 0,
+ OWN_SKIP_INTERCEPTOR = kAccessCheck,
+ OWN = kAccessCheck | kInterceptor,
+ HIDDEN_PROPERTY = kHidden,
+ HIDDEN_SKIP_INTERCEPTOR = kAccessCheck | kHidden,
+ HIDDEN = kAccessCheck | kHidden | kInterceptor,
+ PROTOTYPE_CHAIN_PROPERTY = kHidden | kPrototypeChain,
+ PROTOTYPE_CHAIN_SKIP_INTERCEPTOR = kAccessCheck | kHidden |
kPrototypeChain,
+ PROTOTYPE_CHAIN = kAccessCheck | kHidden | kPrototypeChain |
kInterceptor
};
enum State {
@@ -54,7 +56,7 @@
};
LookupIterator(Handle<Object> receiver, Handle<Name> name,
- Configuration configuration = CHECK_DERIVED)
+ Configuration configuration = PROTOTYPE_CHAIN)
: configuration_(ComputeConfiguration(configuration, name)),
state_(NOT_FOUND),
property_kind_(DATA),
@@ -72,7 +74,7 @@
LookupIterator(Handle<Object> receiver, Handle<Name> name,
Handle<JSReceiver> holder,
- Configuration configuration = CHECK_DERIVED)
+ Configuration configuration = PROTOTYPE_CHAIN)
: configuration_(ComputeConfiguration(configuration, name)),
state_(NOT_FOUND),
property_kind_(DATA),
@@ -191,17 +193,15 @@
bool is_guaranteed_to_have_holder() const {
return !maybe_receiver_.is_null();
}
+ bool check_access_check() const {
+ return (configuration_ & kAccessCheck) != 0;
+ }
+ bool check_hidden() const { return (configuration_ & kHidden) != 0; }
bool check_interceptor() const {
- return !IsBootstrapping() && (configuration_ & CHECK_INTERCEPTOR) != 0;
- }
- bool check_derived() const {
- return (configuration_ & CHECK_DERIVED_PROPERTY) != 0;
- }
- bool check_hidden() const {
- return (configuration_ & CHECK_HIDDEN_PROPERTY) != 0;
+ return !IsBootstrapping() && (configuration_ & kInterceptor) != 0;
}
- bool check_access_check() const {
- return (configuration_ & CHECK_ACCESS_CHECK) != 0;
+ bool check_prototype_chain() const {
+ return (configuration_ & kPrototypeChain) != 0;
}
int descriptor_number() const {
DCHECK(has_property_);
@@ -217,7 +217,7 @@
static Configuration ComputeConfiguration(
Configuration configuration, Handle<Name> name) {
if (name->IsOwn()) {
- return static_cast<Configuration>(configuration & CHECK_HIDDEN);
+ return static_cast<Configuration>(configuration & HIDDEN);
} else {
return configuration;
}
=======================================
--- /branches/bleeding_edge/src/objects.cc Mon Aug 25 11:31:38 2014 UTC
+++ /branches/bleeding_edge/src/objects.cc Mon Aug 25 11:34:43 2014 UTC
@@ -143,7 +143,7 @@
Handle<Object> JSObject::GetDataProperty(Handle<JSObject> object,
Handle<Name> key) {
- LookupIterator it(object, key, LookupIterator::CHECK_DERIVED_PROPERTY);
+ LookupIterator it(object, key, LookupIterator::PROTOTYPE_CHAIN_PROPERTY);
return GetDataProperty(&it);
}
@@ -3787,7 +3787,7 @@
void JSObject::AddProperty(Handle<JSObject> object, Handle<Name> name,
Handle<Object> value,
PropertyAttributes attributes) {
- LookupIterator it(object, name, LookupIterator::CHECK_PROPERTY);
+ LookupIterator it(object, name, LookupIterator::OWN_PROPERTY);
#ifdef DEBUG
uint32_t index;
DCHECK(!object->IsJSProxy());
@@ -3812,8 +3812,7 @@
PropertyAttributes attributes,
ExecutableAccessorInfoHandling handling) {
DCHECK(!value->IsTheHole());
- LookupIterator it(object, name,
- LookupIterator::CHECK_HIDDEN_SKIP_INTERCEPTOR);
+ LookupIterator it(object, name, LookupIterator::HIDDEN_SKIP_INTERCEPTOR);
bool is_observed = object->map()->is_observed() &&
*name != it.isolate()->heap()->hidden_string();
for (; it.IsFound(); it.Next()) {
@@ -3984,7 +3983,7 @@
if (object->IsJSObject() && name->AsArrayIndex(&index)) {
return GetOwnElementAttribute(object, index);
}
- LookupIterator it(object, name, LookupIterator::CHECK_HIDDEN);
+ LookupIterator it(object, name, LookupIterator::HIDDEN);
return GetPropertyAttributes(&it);
}
@@ -4692,7 +4691,7 @@
bool JSObject::HasHiddenProperties(Handle<JSObject> object) {
Handle<Name> hidden = object->GetIsolate()->factory()->hidden_string();
- LookupIterator it(object, hidden, LookupIterator::CHECK_PROPERTY);
+ LookupIterator it(object, hidden, LookupIterator::OWN_PROPERTY);
Maybe<PropertyAttributes> maybe = GetPropertyAttributes(&it);
// Cannot get an exception since the hidden_string isn't accessible to
JS.
DCHECK(maybe.has_value);
@@ -4727,7 +4726,7 @@
} else {
Isolate* isolate = GetIsolate();
LookupIterator it(handle(this), isolate->factory()->hidden_string(),
- LookupIterator::CHECK_PROPERTY);
+ LookupIterator::OWN_PROPERTY);
if (it.IsFound() && it.HasProperty()) {
DCHECK_EQ(LookupIterator::DATA, it.property_kind());
return *it.GetDataValue();
@@ -4923,9 +4922,8 @@
// Skip interceptors on FORCE_DELETION.
LookupIterator::Configuration config =
- delete_mode == FORCE_DELETION
- ? LookupIterator::CHECK_HIDDEN_SKIP_INTERCEPTOR
- : LookupIterator::CHECK_HIDDEN;
+ delete_mode == FORCE_DELETION ?
LookupIterator::HIDDEN_SKIP_INTERCEPTOR
+ : LookupIterator::HIDDEN;
LookupIterator it(object, name, config);
@@ -6154,8 +6152,7 @@
Object::GetElement(isolate, object, index).ToHandleChecked();
}
} else {
- LookupIterator it(object, name,
- LookupIterator::CHECK_HIDDEN_SKIP_INTERCEPTOR);
+ LookupIterator it(object, name,
LookupIterator::HIDDEN_SKIP_INTERCEPTOR);
CHECK(GetPropertyAttributes(&it).has_value);
preexists = it.IsFound();
if (preexists && (it.property_kind() == LookupIterator::DATA ||
@@ -6174,7 +6171,7 @@
setter->IsNull());
// At least one of the accessors needs to be a new value.
DCHECK(!getter->IsNull() || !setter->IsNull());
- LookupIterator it(object, name, LookupIterator::CHECK_PROPERTY);
+ LookupIterator it(object, name, LookupIterator::OWN_PROPERTY);
if (!getter->IsNull()) {
it.TransitionToAccessorProperty(ACCESSOR_GETTER, getter, attributes);
}
@@ -6257,8 +6254,7 @@
SetElementCallback(object, index, info, info->property_attributes());
} else {
// Lookup the name.
- LookupIterator it(object, name,
- LookupIterator::CHECK_HIDDEN_SKIP_INTERCEPTOR);
+ LookupIterator it(object, name,
LookupIterator::HIDDEN_SKIP_INTERCEPTOR);
CHECK(GetPropertyAttributes(&it).has_value);
// ES5 forbids turning a property into an accessor if it's not
// configurable. See 8.6.1 (Table 5).
@@ -6316,7 +6312,7 @@
}
} else {
LookupIterator it(object, name,
- LookupIterator::CHECK_DERIVED_SKIP_INTERCEPTOR);
+ LookupIterator::PROTOTYPE_CHAIN_SKIP_INTERCEPTOR);
for (; it.IsFound(); it.Next()) {
switch (it.state()) {
case LookupIterator::INTERCEPTOR:
@@ -12859,7 +12855,7 @@
CHECK(array->length()->ToArrayIndex(&length));
if (length <= index) {
LookupIterator it(array,
array->GetIsolate()->factory()->length_string(),
- LookupIterator::CHECK_PROPERTY);
+ LookupIterator::OWN_PROPERTY);
CHECK(it.IsFound());
CHECK(it.HasProperty());
return it.IsReadOnly();
@@ -13246,7 +13242,7 @@
Maybe<bool> JSObject::HasRealNamedProperty(Handle<JSObject> object,
Handle<Name> key) {
- LookupIterator it(object, key, LookupIterator::CHECK_ACCESS_CHECK);
+ LookupIterator it(object, key, LookupIterator::OWN_SKIP_INTERCEPTOR);
Maybe<PropertyAttributes> maybe_result = GetPropertyAttributes(&it);
if (!maybe_result.has_value) return Maybe<bool>();
return maybe(it.IsFound());
@@ -13284,7 +13280,7 @@
Maybe<bool> JSObject::HasRealNamedCallbackProperty(Handle<JSObject> object,
Handle<Name> key) {
- LookupIterator it(object, key, LookupIterator::CHECK_ACCESS_CHECK);
+ LookupIterator it(object, key, LookupIterator::OWN_SKIP_INTERCEPTOR);
Maybe<PropertyAttributes> maybe_result = GetPropertyAttributes(&it);
if (!maybe_result.has_value) return Maybe<bool>();
return maybe(it.IsFound() && it.property_kind() ==
LookupIterator::ACCESSOR);
=======================================
--- /branches/bleeding_edge/src/runtime.cc Mon Aug 25 11:31:38 2014 UTC
+++ /branches/bleeding_edge/src/runtime.cc Mon Aug 25 11:34:43 2014 UTC
@@ -1981,7 +1981,7 @@
}
} else {
// Get attributes.
- LookupIterator it(obj, name, LookupIterator::CHECK_HIDDEN);
+ LookupIterator it(obj, name, LookupIterator::HIDDEN);
Maybe<PropertyAttributes> maybe = JSObject::GetPropertyAttributes(&it);
if (!maybe.has_value) return MaybeHandle<Object>();
attrs = maybe.value;
@@ -2179,7 +2179,7 @@
PropertyAttributes attr, bool is_var,
bool is_const, bool is_function) {
// Do the lookup own properties only, see ES5 erratum.
- LookupIterator it(global, name, LookupIterator::CHECK_HIDDEN_PROPERTY);
+ LookupIterator it(global, name, LookupIterator::HIDDEN_PROPERTY);
Maybe<PropertyAttributes> maybe = JSReceiver::GetPropertyAttributes(&it);
DCHECK(maybe.has_value);
PropertyAttributes old_attributes = maybe.value;
@@ -2309,7 +2309,7 @@
Handle<GlobalObject> global = isolate->global_object();
// Lookup the property as own on the global object.
- LookupIterator it(global, name, LookupIterator::CHECK_HIDDEN_PROPERTY);
+ LookupIterator it(global, name, LookupIterator::HIDDEN_PROPERTY);
Maybe<PropertyAttributes> maybe = JSReceiver::GetPropertyAttributes(&it);
DCHECK(maybe.has_value);
PropertyAttributes old_attributes = maybe.value;
@@ -2459,7 +2459,7 @@
// code can run in between that modifies the declared property.
DCHECK(holder->IsJSGlobalObject() ||
holder->IsJSContextExtensionObject());
- LookupIterator it(holder, name, LookupIterator::CHECK_HIDDEN_PROPERTY);
+ LookupIterator it(holder, name, LookupIterator::HIDDEN_PROPERTY);
Maybe<PropertyAttributes> maybe =
JSReceiver::GetPropertyAttributes(&it);
if (!maybe.has_value) return isolate->heap()->exception();
PropertyAttributes old_attributes = maybe.value;
@@ -4890,7 +4890,7 @@
}
// Lookup cache miss. Perform lookup and update the cache if
// appropriate.
- LookupIterator it(receiver, key, LookupIterator::CHECK_OWN);
+ LookupIterator it(receiver, key, LookupIterator::OWN);
if (it.IsFound() && it.state() == LookupIterator::PROPERTY &&
it.HasProperty() && it.property_details().type() == FIELD) {
FieldIndex field_index = it.GetFieldIndex();
@@ -5046,7 +5046,7 @@
return isolate->heap()->undefined_value();
}
- LookupIterator it(js_object, name, LookupIterator::CHECK_PROPERTY);
+ LookupIterator it(js_object, name, LookupIterator::OWN_PROPERTY);
// Take special care when attributes are different and there is already
// a property.
@@ -5294,7 +5294,7 @@
#ifdef DEBUG
uint32_t index = 0;
DCHECK(!key->ToArrayIndex(&index));
- LookupIterator it(object, key, LookupIterator::CHECK_PROPERTY);
+ LookupIterator it(object, key, LookupIterator::OWN_PROPERTY);
Maybe<PropertyAttributes> maybe = JSReceiver::GetPropertyAttributes(&it);
DCHECK(maybe.has_value);
RUNTIME_ASSERT(!it.IsFound());
@@ -5326,7 +5326,7 @@
bool duplicate;
if (key->IsName()) {
LookupIterator it(object, Handle<Name>::cast(key),
- LookupIterator::CHECK_PROPERTY);
+ LookupIterator::OWN_PROPERTY);
Maybe<PropertyAttributes> maybe =
JSReceiver::GetPropertyAttributes(&it);
DCHECK(maybe.has_value);
duplicate = it.IsFound();
@@ -10984,7 +10984,7 @@
return *isolate->factory()->NewJSArrayWithElements(details);
}
- LookupIterator it(obj, name, LookupIterator::CHECK_HIDDEN);
+ LookupIterator it(obj, name, LookupIterator::HIDDEN);
bool has_caught = false;
Handle<Object> value = DebugGetProperty(&it, &has_caught);
if (!it.IsFound()) return isolate->heap()->undefined_value();
@@ -11025,7 +11025,7 @@
CONVERT_ARG_HANDLE_CHECKED(JSObject, obj, 0);
CONVERT_ARG_HANDLE_CHECKED(Name, name, 1);
- LookupIterator it(obj, name, LookupIterator::CHECK_DERIVED);
+ LookupIterator it(obj, name);
return *DebugGetProperty(&it);
}
=======================================
--- /branches/bleeding_edge/test/cctest/test-api.cc Mon Aug 25 08:56:31
2014 UTC
+++ /branches/bleeding_edge/test/cctest/test-api.cc Mon Aug 25 11:34:43
2014 UTC
@@ -2045,7 +2045,7 @@
i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(isolate);
i::LookupResult lookup(i_isolate);
i::Handle<i::String> name(v8::Utils::OpenHandle(*v8_str("length")));
- i::LookupIterator it(a, name, i::LookupIterator::CHECK_PROPERTY);
+ i::LookupIterator it(a, name, i::LookupIterator::OWN_PROPERTY);
CHECK(it.HasProperty());
CHECK(it.GetAccessors()->IsExecutableAccessorInfo());
}
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
