Revision: 23165
Author: [email protected]
Date: Mon Aug 18 14:38:44 2014 UTC
Log: Always assume SetOwnPropertyIgnoreAttributes to be
CERTAINLY_NOT_FROM_KEYED
BUG=
[email protected]
Review URL: https://codereview.chromium.org/463963002
http://code.google.com/p/v8/source/detail?r=23165
Modified:
/branches/bleeding_edge/src/objects.cc
/branches/bleeding_edge/src/objects.h
/branches/bleeding_edge/src/runtime.cc
/branches/bleeding_edge/src/runtime.h
=======================================
--- /branches/bleeding_edge/src/objects.cc Mon Aug 18 14:27:24 2014 UTC
+++ /branches/bleeding_edge/src/objects.cc Mon Aug 18 14:38:44 2014 UTC
@@ -3894,7 +3894,6 @@
Handle<Name> name,
Handle<Object> value,
PropertyAttributes attributes,
- StoreFromKeyed store_from_keyed,
ExecutableAccessorInfoHandling handling) {
DCHECK(!value->IsTheHole());
LookupIterator it(object, name, LookupIterator::CHECK_HIDDEN_ACCESS);
@@ -4012,7 +4011,8 @@
}
}
- return AddDataProperty(&it, value, attributes, STRICT, store_from_keyed);
+ return AddDataProperty(&it, value, attributes, STRICT,
+ CERTAINLY_NOT_STORE_FROM_KEYED);
}
=======================================
--- /branches/bleeding_edge/src/objects.h Mon Aug 18 14:27:24 2014 UTC
+++ /branches/bleeding_edge/src/objects.h Mon Aug 18 14:38:44 2014 UTC
@@ -2140,7 +2140,6 @@
Handle<Name> key,
Handle<Object> value,
PropertyAttributes attributes,
- StoreFromKeyed store_mode = MAY_BE_STORE_FROM_KEYED,
ExecutableAccessorInfoHandling handling = DEFAULT_HANDLING);
static void AddProperty(Handle<JSObject> object, Handle<Name> key,
=======================================
--- /branches/bleeding_edge/src/runtime.cc Mon Aug 18 14:27:24 2014 UTC
+++ /branches/bleeding_edge/src/runtime.cc Mon Aug 18 14:38:44 2014 UTC
@@ -5042,16 +5042,14 @@
isolate, result,
JSObject::SetOwnPropertyIgnoreAttributes(
js_object, name, obj_value, attr,
- JSReceiver::MAY_BE_STORE_FROM_KEYED,
JSObject::DONT_FORCE_FIELD));
+ JSObject::DONT_FORCE_FIELD));
return *result;
}
Handle<Object> result;
ASSIGN_RETURN_FAILURE_ON_EXCEPTION(
isolate, result,
- Runtime::DefineObjectProperty(
- js_object, name, obj_value, attr,
- JSReceiver::CERTAINLY_NOT_STORE_FROM_KEYED));
+ Runtime::DefineObjectProperty(js_object, name, obj_value, attr));
return *result;
}
@@ -5163,12 +5161,10 @@
}
-MaybeHandle<Object> Runtime::DefineObjectProperty(
- Handle<JSObject> js_object,
- Handle<Object> key,
- Handle<Object> value,
- PropertyAttributes attr,
- JSReceiver::StoreFromKeyed store_from_keyed) {
+MaybeHandle<Object> Runtime::DefineObjectProperty(Handle<JSObject>
js_object,
+ Handle<Object> key,
+ Handle<Object> value,
+ PropertyAttributes attr)
{
Isolate* isolate = js_object->GetIsolate();
// Check if the given key is an array index.
uint32_t index;
@@ -5196,7 +5192,7 @@
} else {
if (name->IsString()) name =
String::Flatten(Handle<String>::cast(name));
return JSObject::SetOwnPropertyIgnoreAttributes(js_object, name,
value,
- attr,
store_from_keyed);
+ attr);
}
}
@@ -5211,7 +5207,7 @@
SLOPPY, false, DEFINE_PROPERTY);
} else {
return JSObject::SetOwnPropertyIgnoreAttributes(js_object, name, value,
- attr,
store_from_keyed);
+ attr);
}
}
=======================================
--- /branches/bleeding_edge/src/runtime.h Wed Aug 13 14:09:50 2014 UTC
+++ /branches/bleeding_edge/src/runtime.h Mon Aug 18 14:38:44 2014 UTC
@@ -826,12 +826,8 @@
Handle<Object> value, StrictMode strict_mode);
MUST_USE_RESULT static MaybeHandle<Object> DefineObjectProperty(
- Handle<JSObject> object,
- Handle<Object> key,
- Handle<Object> value,
- PropertyAttributes attr,
- JSReceiver::StoreFromKeyed store_from_keyed =
- JSReceiver::MAY_BE_STORE_FROM_KEYED);
+ Handle<JSObject> object, Handle<Object> key, Handle<Object> value,
+ PropertyAttributes attr);
MUST_USE_RESULT static MaybeHandle<Object> DeleteObjectProperty(
Isolate* isolate,
--
--
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.
