From 974ab4060fe3eff74dc0a62a5a27d516738f4c55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Sat, 29 Jan 2022 08:33:07 +0100 Subject: deps: update V8 to 9.8.177.9 PR-URL: https://github.com/nodejs/node/pull/41610 Reviewed-By: Jiawen Geng Reviewed-By: Antoine du Hamel Reviewed-By: Darshan Sen Reviewed-By: Colin Ihrig --- deps/v8/include/v8-message.h | 68 +++++++++++++++++++++++++++----------------- 1 file changed, 42 insertions(+), 26 deletions(-) (limited to 'deps/v8/include/v8-message.h') diff --git a/deps/v8/include/v8-message.h b/deps/v8/include/v8-message.h index 8f09619cba..a17eb7026d 100644 --- a/deps/v8/include/v8-message.h +++ b/deps/v8/include/v8-message.h @@ -11,6 +11,7 @@ #include "v8-local-handle.h" // NOLINT(build/include_directory) #include "v8-maybe.h" // NOLINT(build/include_directory) +#include "v8-primitive.h" // NOLINT(build/include_directory) #include "v8config.h" // NOLINT(build/include_directory) namespace v8 { @@ -60,9 +61,7 @@ class ScriptOriginOptions { */ class V8_EXPORT ScriptOrigin { public: - #if defined(_MSC_VER) && _MSC_VER >= 1910 /* Disable on VS2015 */ V8_DEPRECATED("Use constructor with primitive C++ types") - #endif ScriptOrigin( Local resource_name, Local resource_line_offset, Local resource_column_offset, @@ -72,26 +71,26 @@ class V8_EXPORT ScriptOrigin { Local resource_is_opaque = Local(), Local is_wasm = Local(), Local is_module = Local(), - Local host_defined_options = Local()); - #if defined(_MSC_VER) && _MSC_VER >= 1910 /* Disable on VS2015 */ + Local host_defined_options = Local()); V8_DEPRECATED("Use constructor that takes an isolate") - #endif - explicit ScriptOrigin( - Local resource_name, int resource_line_offset = 0, - int resource_column_offset = 0, - bool resource_is_shared_cross_origin = false, int script_id = -1, - Local source_map_url = Local(), - bool resource_is_opaque = false, bool is_wasm = false, - bool is_module = false, - Local host_defined_options = Local()); - V8_INLINE ScriptOrigin( - Isolate* isolate, Local resource_name, - int resource_line_offset = 0, int resource_column_offset = 0, - bool resource_is_shared_cross_origin = false, int script_id = -1, - Local source_map_url = Local(), - bool resource_is_opaque = false, bool is_wasm = false, - bool is_module = false, - Local host_defined_options = Local()) + explicit ScriptOrigin(Local resource_name, + int resource_line_offset = 0, + int resource_column_offset = 0, + bool resource_is_shared_cross_origin = false, + int script_id = -1, + Local source_map_url = Local(), + bool resource_is_opaque = false, bool is_wasm = false, + bool is_module = false, + Local host_defined_options = Local()); + V8_INLINE ScriptOrigin(Isolate* isolate, Local resource_name, + int resource_line_offset = 0, + int resource_column_offset = 0, + bool resource_is_shared_cross_origin = false, + int script_id = -1, + Local source_map_url = Local(), + bool resource_is_opaque = false, bool is_wasm = false, + bool is_module = false, + Local host_defined_options = Local()) : isolate_(isolate), resource_name_(resource_name), resource_line_offset_(resource_line_offset), @@ -100,7 +99,9 @@ class V8_EXPORT ScriptOrigin { is_module), script_id_(script_id), source_map_url_(source_map_url), - host_defined_options_(host_defined_options) {} + host_defined_options_(host_defined_options) { + VerifyHostDefinedOptions(); + } V8_INLINE Local ResourceName() const; V8_DEPRECATED("Use getter with primitive C++ types.") @@ -113,10 +114,13 @@ class V8_EXPORT ScriptOrigin { V8_INLINE int ColumnOffset() const; V8_INLINE int ScriptId() const; V8_INLINE Local SourceMapUrl() const; - V8_INLINE Local HostDefinedOptions() const; + V8_DEPRECATE_SOON("Use GetHostDefinedOptions") + Local HostDefinedOptions() const; + V8_INLINE Local GetHostDefinedOptions() const; V8_INLINE ScriptOriginOptions Options() const { return options_; } private: + void VerifyHostDefinedOptions() const; Isolate* isolate_; Local resource_name_; int resource_line_offset_; @@ -124,7 +128,7 @@ class V8_EXPORT ScriptOrigin { ScriptOriginOptions options_; int script_id_; Local source_map_url_; - Local host_defined_options_; + Local host_defined_options_; }; /** @@ -212,7 +216,7 @@ class V8_EXPORT Message { bool IsSharedCrossOrigin() const; bool IsOpaque() const; - V8_DEPRECATE_SOON("Use the version that takes a std::ostream&.") + V8_DEPRECATED("Use the version that takes a std::ostream&.") static void PrintCurrentStackTrace(Isolate* isolate, FILE* out); static void PrintCurrentStackTrace(Isolate* isolate, std::ostream& out); @@ -224,7 +228,19 @@ class V8_EXPORT Message { Local ScriptOrigin::ResourceName() const { return resource_name_; } -Local ScriptOrigin::HostDefinedOptions() const { +Local ScriptOrigin::ResourceLineOffset() const { + return v8::Integer::New(isolate_, resource_line_offset_); +} + +Local ScriptOrigin::ResourceColumnOffset() const { + return v8::Integer::New(isolate_, resource_column_offset_); +} + +Local ScriptOrigin::ScriptID() const { + return v8::Integer::New(isolate_, script_id_); +} + +Local ScriptOrigin::GetHostDefinedOptions() const { return host_defined_options_; } -- cgit v1.2.1