diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-13 15:05:36 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-14 10:33:47 +0000 |
commit | e684a3455bcc29a6e3e66a004e352dea4e1141e7 (patch) | |
tree | d55b4003bde34d7d05f558f02cfd82b2a66a7aac /chromium/v8/src/wasm/wasm-result.cc | |
parent | 2b94bfe47ccb6c08047959d1c26e392919550e86 (diff) | |
download | qtwebengine-chromium-e684a3455bcc29a6e3e66a004e352dea4e1141e7.tar.gz |
BASELINE: Update Chromium to 72.0.3626.110 and Ninja to 1.9.0
Change-Id: Ic57220b00ecc929a893c91f5cc552f5d3e99e922
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/v8/src/wasm/wasm-result.cc')
-rw-r--r-- | chromium/v8/src/wasm/wasm-result.cc | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/chromium/v8/src/wasm/wasm-result.cc b/chromium/v8/src/wasm/wasm-result.cc index 1bcad130301..251563e15b1 100644 --- a/chromium/v8/src/wasm/wasm-result.cc +++ b/chromium/v8/src/wasm/wasm-result.cc @@ -49,18 +49,11 @@ void PrintFToString(std::string& str, size_t str_offset, const char* format, } // namespace -void ResultBase::error(uint32_t offset, std::string error_msg) { - // The error message must not be empty, otherwise Result::failed() will be - // false. - DCHECK(!error_msg.empty()); - error_offset_ = offset; - error_msg_ = std::move(error_msg); -} - -void ResultBase::verror(const char* format, va_list args) { - VPrintFToString(error_msg_, 0, format, args); - // Assign default message such that ok() and failed() work. - if (error_msg_.empty() == 0) error_msg_.assign("Error"); +// static +std::string ResultBase::FormatError(const char* format, va_list args) { + std::string result; + VPrintFToString(result, 0, format, args); + return result; } void ErrorThrower::Format(ErrorType type, const char* format, va_list args) { @@ -133,9 +126,9 @@ Handle<Object> ErrorThrower::Reify() { constructor = isolate_->wasm_runtime_error_function(); break; } - Vector<const char> msg_vec(error_msg_.data(), error_msg_.size()); - Handle<String> message = - isolate_->factory()->NewStringFromUtf8(msg_vec).ToHandleChecked(); + Handle<String> message = isolate_->factory() + ->NewStringFromUtf8(VectorOf(error_msg_)) + .ToHandleChecked(); Reset(); return isolate_->factory()->NewError(constructor, message); } |