diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-18 14:34:04 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-04 11:15:27 +0000 |
| commit | e6430e577f105ad8813c92e75c54660c4985026e (patch) | |
| tree | 88115e5d1fb471fea807111924dcccbeadbf9e4f /chromium/v8/src/json-parser.cc | |
| parent | 53d399fe6415a96ea6986ec0d402a9c07da72453 (diff) | |
| download | qtwebengine-chromium-e6430e577f105ad8813c92e75c54660c4985026e.tar.gz | |
BASELINE: Update Chromium to 61.0.3163.99
Change-Id: I8452f34574d88ca2b27af9bd56fc9ff3f16b1367
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/v8/src/json-parser.cc')
| -rw-r--r-- | chromium/v8/src/json-parser.cc | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/chromium/v8/src/json-parser.cc b/chromium/v8/src/json-parser.cc index 93d305df7ad..ab48034b176 100644 --- a/chromium/v8/src/json-parser.cc +++ b/chromium/v8/src/json-parser.cc @@ -80,6 +80,8 @@ MaybeHandle<Object> JsonParseInternalizer::InternalizeJsonProperty( bool JsonParseInternalizer::RecurseAndApply(Handle<JSReceiver> holder, Handle<String> name) { + STACK_CHECK(isolate_, false); + Handle<Object> result; ASSIGN_RETURN_ON_EXCEPTION_VALUE( isolate_, result, InternalizeJsonProperty(holder, name), false); @@ -513,14 +515,14 @@ class ElementKindLattice { ElementsKind GetElementsKind() const { switch (value_) { case SMI_ELEMENTS: - return FAST_SMI_ELEMENTS; + return PACKED_SMI_ELEMENTS; case NUMBER_ELEMENTS: - return FAST_DOUBLE_ELEMENTS; + return PACKED_DOUBLE_ELEMENTS; case OBJECT_ELEMENTS: - return FAST_ELEMENTS; + return PACKED_ELEMENTS; default: UNREACHABLE(); - return FAST_ELEMENTS; + return PACKED_ELEMENTS; } } @@ -557,15 +559,15 @@ Handle<Object> JsonParser<seq_one_byte>::ParseJsonArray() { const ElementsKind kind = lattice.GetElementsKind(); switch (kind) { - case FAST_ELEMENTS: - case FAST_SMI_ELEMENTS: { + case PACKED_ELEMENTS: + case PACKED_SMI_ELEMENTS: { Handle<FixedArray> elems = factory()->NewFixedArray(elements.length(), pretenure_); for (int i = 0; i < elements.length(); i++) elems->set(i, *elements[i]); json_array = factory()->NewJSArrayWithElements(elems, kind, pretenure_); break; } - case FAST_DOUBLE_ELEMENTS: { + case PACKED_DOUBLE_ELEMENTS: { Handle<FixedDoubleArray> elems = Handle<FixedDoubleArray>::cast( factory()->NewFixedDoubleArray(elements.length(), pretenure_)); for (int i = 0; i < elements.length(); i++) { |