diff options
author | Michaël Zasso <targos@protonmail.com> | 2018-09-07 17:07:13 +0200 |
---|---|---|
committer | Michaël Zasso <targos@protonmail.com> | 2018-09-07 20:59:13 +0200 |
commit | 586db2414a338e1bf6eaf6e672a3adc7ce309f6a (patch) | |
tree | 139fa972aef648481ddee22a3a85b99707d28df5 /deps/v8/src/json-parser.cc | |
parent | 12ed7c94e5160aa6d38e3d2cb2a73dae0a6f9342 (diff) | |
download | android-node-v8-586db2414a338e1bf6eaf6e672a3adc7ce309f6a.tar.gz android-node-v8-586db2414a338e1bf6eaf6e672a3adc7ce309f6a.tar.bz2 android-node-v8-586db2414a338e1bf6eaf6e672a3adc7ce309f6a.zip |
deps: update V8 to 6.9.427.22
PR-URL: https://github.com/nodejs/node/pull/21983
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Diffstat (limited to 'deps/v8/src/json-parser.cc')
-rw-r--r-- | deps/v8/src/json-parser.cc | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/deps/v8/src/json-parser.cc b/deps/v8/src/json-parser.cc index 7da11db9cf..28819c4cd0 100644 --- a/deps/v8/src/json-parser.cc +++ b/deps/v8/src/json-parser.cc @@ -60,7 +60,7 @@ MaybeHandle<Object> JsonParseInternalizer::Internalize(Isolate* isolate, Handle<JSObject> holder = isolate->factory()->NewJSObject(isolate->object_function()); Handle<String> name = isolate->factory()->empty_string(); - JSObject::AddProperty(holder, name, object, NONE); + JSObject::AddProperty(isolate, holder, name, object, NONE); return internalizer.InternalizeJsonProperty(holder, name); } @@ -69,7 +69,8 @@ MaybeHandle<Object> JsonParseInternalizer::InternalizeJsonProperty( HandleScope outer_scope(isolate_); Handle<Object> value; ASSIGN_RETURN_ON_EXCEPTION( - isolate_, value, Object::GetPropertyOrElement(holder, name), Object); + isolate_, value, Object::GetPropertyOrElement(isolate_, holder, name), + Object); if (value->IsJSReceiver()) { Handle<JSReceiver> object = Handle<JSReceiver>::cast(value); Maybe<bool> is_array = Object::IsArray(object); @@ -143,7 +144,7 @@ JsonParser<seq_one_byte>::JsonParser(Isolate* isolate, Handle<String> source) isolate_), position_(-1), properties_(&zone_) { - source_ = String::Flatten(source_); + source_ = String::Flatten(isolate, source_); pretenure_ = (source_length_ >= kPretenureTreshold) ? TENURED : NOT_TENURED; // Optimized fast case where we only have Latin1 characters. @@ -365,7 +366,7 @@ Handle<Object> JsonParser<seq_one_byte>::ParseJsonObject() { HandleScope scope(isolate()); Handle<JSObject> json_object = factory()->NewJSObject(object_constructor(), pretenure_); - Handle<Map> map(json_object->map()); + Handle<Map> map(json_object->map(), isolate()); int descriptor = 0; VectorSegment<ZoneVector<Handle<Object>>> properties(&properties_); DCHECK_EQ(c0_, '{'); @@ -404,7 +405,7 @@ Handle<Object> JsonParser<seq_one_byte>::ParseJsonObject() { Handle<Map> target; if (seq_one_byte) { DisallowHeapAllocation no_gc; - TransitionsAccessor transitions(*map, &no_gc); + TransitionsAccessor transitions(isolate(), *map, &no_gc); key = transitions.ExpectedTransitionKey(); follow_expected = !key.is_null() && ParseJsonString(key); // If the expected transition hits, follow it. @@ -419,9 +420,9 @@ Handle<Object> JsonParser<seq_one_byte>::ParseJsonObject() { if (key.is_null()) return ReportUnexpectedCharacter(); // If a transition was found, follow it and continue. - transitioning = - TransitionsAccessor(map).FindTransitionToField(key).ToHandle( - &target); + transitioning = TransitionsAccessor(isolate(), map) + .FindTransitionToField(key) + .ToHandle(&target); } if (c0_ != ':') return ReportUnexpectedCharacter(); @@ -441,8 +442,9 @@ Handle<Object> JsonParser<seq_one_byte>::ParseJsonObject() { ->NowContains(value)) { Handle<FieldType> value_type( value->OptimalType(isolate(), expected_representation)); - Map::GeneralizeField(target, descriptor, details.constness(), - expected_representation, value_type); + Map::GeneralizeField(isolate(), target, descriptor, + details.constness(), expected_representation, + value_type); } DCHECK(target->instance_descriptors() ->GetFieldType(descriptor) @@ -831,7 +833,8 @@ Handle<String> JsonParser<seq_one_byte>::ScanJsonString() { int position = position_; uc32 c0 = c0_; - uint32_t running_hash = isolate()->heap()->HashSeed(); + uint32_t running_hash = + static_cast<uint32_t>(isolate()->heap()->HashSeed()); uint32_t index = 0; bool is_array_index = true; |