diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-11 11:32:04 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-18 13:40:17 +0000 |
| commit | 31ccca0778db85c159634478b4ec7997f6704860 (patch) | |
| tree | 3d33fc3afd9d5ec95541e1bbe074a9cf8da12a0e /chromium/v8/src/builtins/accessors.cc | |
| parent | 248b70b82a40964d5594eb04feca0fa36716185d (diff) | |
| download | qtwebengine-chromium-31ccca0778db85c159634478b4ec7997f6704860.tar.gz | |
BASELINE: Update Chromium to 80.0.3987.136
Change-Id: I98e1649aafae85ba3a83e67af00bb27ef301db7b
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'chromium/v8/src/builtins/accessors.cc')
| -rw-r--r-- | chromium/v8/src/builtins/accessors.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/chromium/v8/src/builtins/accessors.cc b/chromium/v8/src/builtins/accessors.cc index fa39142cb4c..2989f275fd4 100644 --- a/chromium/v8/src/builtins/accessors.cc +++ b/chromium/v8/src/builtins/accessors.cc @@ -851,9 +851,16 @@ void Accessors::RegExpResultIndicesGetter( HandleScope scope(isolate); Handle<JSRegExpResult> regexp_result( Handle<JSRegExpResult>::cast(Utils::OpenHandle(*info.Holder()))); - Handle<Object> indices( + MaybeHandle<JSArray> maybe_indices( JSRegExpResult::GetAndCacheIndices(isolate, regexp_result)); - info.GetReturnValue().Set(Utils::ToLocal(indices)); + Handle<JSArray> indices; + if (!maybe_indices.ToHandle(&indices)) { + isolate->OptionalRescheduleException(false); + Handle<Object> result = isolate->factory()->undefined_value(); + info.GetReturnValue().Set(Utils::ToLocal(result)); + } else { + info.GetReturnValue().Set(Utils::ToLocal(indices)); + } } Handle<AccessorInfo> Accessors::MakeRegExpResultIndicesInfo(Isolate* isolate) { |