Failed to apply patch for src/api.cc:
While running git apply --index -3 -p1;
error: patch failed: src/api.cc:3535
Falling back to three-way merge...
Applied patch to 'src/api.cc' with conflicts.
U src/api.cc
Patch: src/api.cc
Index: src/api.cc
diff --git a/src/api.cc b/src/api.cc
index
b8812800081d1b36ea84b5871c2a80a8d870bb93..0bd435b738b64bb11e3d6a586e7a2217f04fdbdf
100644
--- a/src/api.cc
+++ b/src/api.cc
@@ -3535,7 +3535,7 @@
if (it.IsFound() && !it.IsConfigurable()) return Just(false);
- has_pending_exception = i::Runtime::DefineObjectProperty(
+ has_pending_exception = i::JSObject::SetOwnPropertyIgnoreAttributes(
self, key_obj, value_obj, NONE).is_null();
RETURN_ON_FAILED_EXECUTION_PRIMITIVE(bool);
return Just(true);
@@ -3573,9 +3573,8 @@
return Just(false);
}
- has_pending_exception = i::Runtime::DefineObjectProperty(
- self,
isolate->factory()->Uint32ToString(index),
- value_obj, NONE).is_null();
+ has_pending_exception = i::JSObject::SetOwnElementIgnoreAttributes(
+ self, index, value_obj, NONE).is_null();
RETURN_ON_FAILED_EXECUTION_PRIMITIVE(bool);
return Just(true);
}
@@ -3613,6 +3612,34 @@
}
+MUST_USE_RESULT
+static i::MaybeHandle<i::Object> DefineObjectProperty(
+ i::Handle<i::JSObject> js_object, i::Handle<i::Object> key,
+ i::Handle<i::Object> value, PropertyAttributes attrs) {
+ i::Isolate* isolate = js_object->GetIsolate();
+ // Check if the given key is an array index.
+ uint32_t index = 0;
+ if (key->ToArrayIndex(&index)) {
+ return i::JSObject::SetOwnElementIgnoreAttributes(js_object, index,
value,
+ attrs);
+ }
+
+ i::Handle<i::Name> name;
+ if (key->IsName()) {
+ name = i::Handle<i::Name>::cast(key);
+ } else {
+ // Call-back into JavaScript to convert the key to a string.
+ i::Handle<i::Object> converted;
+ ASSIGN_RETURN_ON_EXCEPTION_VALUE(isolate, converted,
+ i::Execution::ToString(isolate, key),
+ i::MaybeHandle<i::Object>());
+ name = i::Handle<i::String>::cast(converted);
+ }
+
+ return i::JSObject::DefinePropertyOrElement(js_object, name, value,
attrs);
+}
+
+
Maybe<bool> v8::Object::ForceSet(v8::Local<v8::Context> context,
v8::Local<Value> key, v8::Local<Value>
value,
v8::PropertyAttribute attribs) {
@@ -3620,11 +3647,9 @@
auto self = Utils::OpenHandle(this);
auto key_obj = Utils::OpenHandle(*key);
auto value_obj = Utils::OpenHandle(*value);
- has_pending_exception = i::Runtime::DefineObjectProperty(
- self,
- key_obj,
- value_obj,
- static_cast<PropertyAttributes>(attribs)).is_null();
+ has_pending_exception =
+ DefineObjectProperty(self, key_obj, value_obj,
+
static_cast<PropertyAttributes>(attribs)).is_null();
RETURN_ON_FAILED_EXECUTION_PRIMITIVE(bool);
return Just(true);
}
@@ -3640,9 +3665,8 @@
i::Handle<i::Object> key_obj = Utils::OpenHandle(*key);
i::Handle<i::Object> value_obj = Utils::OpenHandle(*value);
has_pending_exception =
- i::Runtime::DefineObjectProperty(self, key_obj, value_obj,
-
static_cast<PropertyAttributes>(attribs))
- .is_null();
+ DefineObjectProperty(self, key_obj, value_obj,
+
static_cast<PropertyAttributes>(attribs)).is_null();
EXCEPTION_BAILOUT_CHECK_SCOPED(isolate, false);
return true;
}
https://codereview.chromium.org/1178703011/
--
--
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.
