diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/v8/src/execution/messages.cc | |
parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
download | qtwebengine-chromium-85-based.tar.gz |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/v8/src/execution/messages.cc')
-rw-r--r-- | chromium/v8/src/execution/messages.cc | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/chromium/v8/src/execution/messages.cc b/chromium/v8/src/execution/messages.cc index 33a2fa99ba6..86e3d48882d 100644 --- a/chromium/v8/src/execution/messages.cc +++ b/chromium/v8/src/execution/messages.cc @@ -311,18 +311,18 @@ MaybeHandle<String> FormatEvalOrigin(Isolate* isolate, Handle<Script> script) { } // namespace -Handle<Object> StackFrameBase::GetEvalOrigin() { +Handle<PrimitiveHeapObject> StackFrameBase::GetEvalOrigin() { if (!HasScript() || !IsEval()) return isolate_->factory()->undefined_value(); return FormatEvalOrigin(isolate_, GetScript()).ToHandleChecked(); } -Handle<Object> StackFrameBase::GetWasmModuleName() { +Handle<PrimitiveHeapObject> StackFrameBase::GetWasmModuleName() { return isolate_->factory()->undefined_value(); } int StackFrameBase::GetWasmFunctionIndex() { return StackFrameBase::kNone; } -Handle<Object> StackFrameBase::GetWasmInstance() { +Handle<HeapObject> StackFrameBase::GetWasmInstance() { return isolate_->factory()->undefined_value(); } @@ -351,6 +351,7 @@ void JSStackFrame::FromFrameArray(Isolate* isolate, Handle<FrameArray> array, is_strict_ = (flags & FrameArray::kIsStrict) != 0; is_async_ = (flags & FrameArray::kIsAsync) != 0; is_promise_all_ = (flags & FrameArray::kIsPromiseAll) != 0; + is_promise_any_ = (flags & FrameArray::kIsPromiseAny) != 0; } JSStackFrame::JSStackFrame(Isolate* isolate, Handle<Object> receiver, @@ -375,7 +376,7 @@ Handle<Object> JSStackFrame::GetFileName() { return handle(GetScript()->name(), isolate_); } -Handle<Object> JSStackFrame::GetFunctionName() { +Handle<PrimitiveHeapObject> JSStackFrame::GetFunctionName() { Handle<String> result = JSFunction::GetDebugName(function_); if (result->length() != 0) return result; @@ -418,7 +419,7 @@ Handle<Object> JSStackFrame::GetScriptNameOrSourceUrl() { return ScriptNameOrSourceUrl(GetScript(), isolate_); } -Handle<Object> JSStackFrame::GetMethodName() { +Handle<PrimitiveHeapObject> JSStackFrame::GetMethodName() { if (receiver_->IsNullOrUndefined(isolate_)) { return isolate_->factory()->null_value(); } @@ -452,7 +453,7 @@ Handle<Object> JSStackFrame::GetMethodName() { } HandleScope outer_scope(isolate_); - Handle<Object> result; + Handle<PrimitiveHeapObject> result; for (PrototypeIterator iter(isolate_, receiver, kStartAtReceiver); !iter.IsAtEnd(); iter.Advance()) { Handle<Object> current = PrototypeIterator::GetCurrent(iter); @@ -478,7 +479,7 @@ Handle<Object> JSStackFrame::GetMethodName() { return isolate_->factory()->null_value(); } -Handle<Object> JSStackFrame::GetTypeName() { +Handle<PrimitiveHeapObject> JSStackFrame::GetTypeName() { // TODO(jgruber): Check for strict/constructor here as in // CallSitePrototypeGetThis. @@ -514,7 +515,7 @@ int JSStackFrame::GetColumnNumber() { } int JSStackFrame::GetPromiseIndex() const { - return is_promise_all_ ? offset_ : kNone; + return (is_promise_all_ || is_promise_any_) ? offset_ : kNone; } bool JSStackFrame::IsNative() { @@ -564,8 +565,8 @@ Handle<Object> WasmStackFrame::GetFunction() const { return handle(Smi::FromInt(wasm_func_index_), isolate_); } -Handle<Object> WasmStackFrame::GetFunctionName() { - Handle<Object> name; +Handle<PrimitiveHeapObject> WasmStackFrame::GetFunctionName() { + Handle<PrimitiveHeapObject> name; Handle<WasmModuleObject> module_object(wasm_instance_->module_object(), isolate_); if (!WasmModuleObject::GetFunctionNameOrNull(isolate_, module_object, @@ -582,8 +583,8 @@ Handle<Object> WasmStackFrame::GetScriptNameOrSourceUrl() { return ScriptNameOrSourceUrl(script, isolate_); } -Handle<Object> WasmStackFrame::GetWasmModuleName() { - Handle<Object> module_name; +Handle<PrimitiveHeapObject> WasmStackFrame::GetWasmModuleName() { + Handle<PrimitiveHeapObject> module_name; Handle<WasmModuleObject> module_object(wasm_instance_->module_object(), isolate_); if (!WasmModuleObject::GetModuleNameOrNull(isolate_, module_object) @@ -593,7 +594,7 @@ Handle<Object> WasmStackFrame::GetWasmModuleName() { return module_name; } -Handle<Object> WasmStackFrame::GetWasmInstance() { return wasm_instance_; } +Handle<HeapObject> WasmStackFrame::GetWasmInstance() { return wasm_instance_; } int WasmStackFrame::GetPosition() const { return IsInterpreted() ? offset_ : code_->GetSourcePositionBefore(offset_); @@ -607,7 +608,9 @@ int WasmStackFrame::GetModuleOffset() const { return function_offset + GetPosition(); } -Handle<Object> WasmStackFrame::Null() const { +Handle<Object> WasmStackFrame::GetFileName() { return Null(); } + +Handle<PrimitiveHeapObject> WasmStackFrame::Null() const { return isolate_->factory()->null_value(); } @@ -1258,14 +1261,13 @@ Handle<String> RenderCallSite(Isolate* isolate, Handle<Object> object, isolate, *location->shared()); UnoptimizedCompileState compile_state(isolate); ParseInfo info(isolate, flags, &compile_state); - if (parsing::ParseAny(&info, location->shared(), isolate)) { + if (parsing::ParseAny(&info, location->shared(), isolate, + parsing::ReportStatisticsMode::kNo)) { info.ast_value_factory()->Internalize(isolate); CallPrinter printer(isolate, location->shared()->IsUserJavaScript()); Handle<String> str = printer.Print(info.literal(), location->start_pos()); *hint = printer.GetErrorHint(); if (str->length() > 0) return str; - } else { - isolate->clear_pending_exception(); } } return BuildDefaultCallSite(isolate, object); @@ -1319,7 +1321,8 @@ Object ErrorUtils::ThrowSpreadArgError(Isolate* isolate, MessageTemplate id, isolate, *location.shared()); UnoptimizedCompileState compile_state(isolate); ParseInfo info(isolate, flags, &compile_state); - if (parsing::ParseAny(&info, location.shared(), isolate)) { + if (parsing::ParseAny(&info, location.shared(), isolate, + parsing::ReportStatisticsMode::kNo)) { info.ast_value_factory()->Internalize(isolate); CallPrinter printer(isolate, location.shared()->IsUserJavaScript(), CallPrinter::SpreadErrorInArgsHint::kErrorInArgs); @@ -1334,7 +1337,6 @@ Object ErrorUtils::ThrowSpreadArgError(Isolate* isolate, MessageTemplate id, MessageLocation(location.script(), pos, pos + 1, location.shared()); } } else { - isolate->clear_pending_exception(); callsite = BuildDefaultCallSite(isolate, object); } } @@ -1396,7 +1398,8 @@ Object ErrorUtils::ThrowLoadFromNullOrUndefined(Isolate* isolate, isolate, *location.shared()); UnoptimizedCompileState compile_state(isolate); ParseInfo info(isolate, flags, &compile_state); - if (parsing::ParseAny(&info, location.shared(), isolate)) { + if (parsing::ParseAny(&info, location.shared(), isolate, + parsing::ReportStatisticsMode::kNo)) { info.ast_value_factory()->Internalize(isolate); CallPrinter printer(isolate, location.shared()->IsUserJavaScript()); Handle<String> str = printer.Print(info.literal(), location.start_pos()); @@ -1431,8 +1434,6 @@ Object ErrorUtils::ThrowLoadFromNullOrUndefined(Isolate* isolate, } if (str->length() > 0) callsite = str; - } else { - isolate->clear_pending_exception(); } } |