Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(970)

Unified Diff: src/runtime/runtime-object.cc

Issue 1173283004: Restore ExecutableAccessorInfoHandling for now (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/runtime/runtime-object.cc
diff --git a/src/runtime/runtime-object.cc b/src/runtime/runtime-object.cc
index 956fee9e838f46214ed47b017e7a0a226efedf99..703bbedabee3528dd1355f756822c0eb1ac5ae54 100644
--- a/src/runtime/runtime-object.cc
+++ b/src/runtime/runtime-object.cc
@@ -174,16 +174,16 @@ MaybeHandle<Object> Runtime::SetObjectProperty(Isolate* isolate,
}
-MaybeHandle<Object> Runtime::DefineObjectProperty(Handle<JSObject> js_object,
- Handle<Object> key,
- Handle<Object> value,
- PropertyAttributes attrs) {
+MaybeHandle<Object> Runtime::DefineObjectProperty(
+ Handle<JSObject> js_object, Handle<Object> key, Handle<Object> value,
+ PropertyAttributes attrs,
+ JSObject::ExecutableAccessorInfoHandling handling) {
Isolate* isolate = js_object->GetIsolate();
// Check if the given key is an array index.
uint32_t index = 0;
if (key->ToArrayIndex(&index)) {
return JSObject::SetOwnElementIgnoreAttributes(js_object, index, value,
- attrs);
+ attrs, handling);
}
Handle<Name> name;
@@ -199,11 +199,11 @@ MaybeHandle<Object> Runtime::DefineObjectProperty(Handle<JSObject> js_object,
if (name->AsArrayIndex(&index)) {
return JSObject::SetOwnElementIgnoreAttributes(js_object, index, value,
- attrs);
+ attrs, handling);
} else {
if (name->IsString()) name = String::Flatten(Handle<String>::cast(name));
return JSObject::SetOwnPropertyIgnoreAttributes(js_object, name, value,
- attrs);
+ attrs, handling);
}
}
@@ -1371,7 +1371,8 @@ RUNTIME_FUNCTION(Runtime_DefineDataPropertyUnchecked) {
Handle<Object> result;
ASSIGN_RETURN_FAILURE_ON_EXCEPTION(
isolate, result,
- Runtime::DefineObjectProperty(js_object, name, obj_value, attrs));
+ Runtime::DefineObjectProperty(js_object, name, obj_value, attrs,
+ JSObject::DONT_FORCE_FIELD));
return *result;
}
« src/api.cc ('K') | « src/runtime/runtime.h ('k') | test/cctest/test-api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698