diff options
| author | Michaël Zasso <targos@protonmail.com> | 2017-05-02 10:50:00 +0200 |
|---|---|---|
| committer | Michaël Zasso <targos@protonmail.com> | 2017-05-06 20:02:35 +0200 |
| commit | 60d1aac8d225e844e68ae48e8f3d58802e635fbe (patch) | |
| tree | 922f347dd054db18d88666fad7181e5a777f4022 /deps/v8/src/json-parser.cc | |
| parent | 73d9c0f903ae371cd5011af64c3a6f69a1bda978 (diff) | |
| download | android-node-v8-60d1aac8d225e844e68ae48e8f3d58802e635fbe.tar.gz android-node-v8-60d1aac8d225e844e68ae48e8f3d58802e635fbe.tar.bz2 android-node-v8-60d1aac8d225e844e68ae48e8f3d58802e635fbe.zip | |
deps: update V8 to 5.8.283.38
PR-URL: https://github.com/nodejs/node/pull/12784
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Diffstat (limited to 'deps/v8/src/json-parser.cc')
| -rw-r--r-- | deps/v8/src/json-parser.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/deps/v8/src/json-parser.cc b/deps/v8/src/json-parser.cc index 6c65234d50..2ec79caefc 100644 --- a/deps/v8/src/json-parser.cc +++ b/deps/v8/src/json-parser.cc @@ -399,8 +399,8 @@ Handle<Object> JsonParser<seq_one_byte>::ParseJsonObject() { ->NowContains(value)) { Handle<FieldType> value_type( value->OptimalType(isolate(), expected_representation)); - Map::GeneralizeField(target, descriptor, expected_representation, - value_type); + Map::GeneralizeField(target, descriptor, details.constness(), + expected_representation, value_type); } DCHECK(target->instance_descriptors() ->GetFieldType(descriptor) @@ -478,12 +478,12 @@ void JsonParser<seq_one_byte>::CommitStateToJsonObject( DCHECK(!json_object->map()->is_dictionary_map()); DisallowHeapAllocation no_gc; - + DescriptorArray* descriptors = json_object->map()->instance_descriptors(); int length = properties->length(); for (int i = 0; i < length; i++) { Handle<Object> value = (*properties)[i]; // Initializing store. - json_object->WriteToField(i, *value); + json_object->WriteToField(i, descriptors->GetDetails(i), *value); } } |