diff options
author | daniel.bevenius <daniel.bevenius@gmail.com> | 2017-05-02 03:28:17 -0700 |
---|---|---|
committer | Myles Borins <mylesborins@google.com> | 2017-08-15 20:57:22 -0700 |
commit | 7fed989deb18c9caaae1f950790c232a3f2e0a25 (patch) | |
tree | 26934924b034e5e4f96fb779e47aad658178fa22 /deps | |
parent | e8438c1b22c2c13b0c992475ac78c460f2d9609e (diff) | |
download | node-new-7fed989deb18c9caaae1f950790c232a3f2e0a25.tar.gz |
deps: cherry-pick f5fad6d from upstream v8
Original commit message:
This commit adds a getter for the private is_verbose_ member.
The use case for this comes from Node.js where the ability to avoid
calling FatalException if the TryCatch is verbose would be nice
to have.
BUG=
Review-Url: https://codereview.chromium.org/2840803002
Cr-Commit-Position: refs/heads/master@{#45018}
PR-URL: https://github.com/nodejs/node/pull/12826
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'deps')
-rw-r--r-- | deps/v8/include/v8-version.h | 2 | ||||
-rw-r--r-- | deps/v8/include/v8.h | 5 | ||||
-rw-r--r-- | deps/v8/src/api.cc | 4 |
3 files changed, 10 insertions, 1 deletions
diff --git a/deps/v8/include/v8-version.h b/deps/v8/include/v8-version.h index e2c861431c..aa916fc125 100644 --- a/deps/v8/include/v8-version.h +++ b/deps/v8/include/v8-version.h @@ -11,7 +11,7 @@ #define V8_MAJOR_VERSION 5 #define V8_MINOR_VERSION 1 #define V8_BUILD_NUMBER 281 -#define V8_PATCH_LEVEL 104 +#define V8_PATCH_LEVEL 105 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) diff --git a/deps/v8/include/v8.h b/deps/v8/include/v8.h index ec45c91d77..2184b4a4b9 100644 --- a/deps/v8/include/v8.h +++ b/deps/v8/include/v8.h @@ -6870,6 +6870,11 @@ class V8_EXPORT TryCatch { void SetVerbose(bool value); /** + * Returns true if verbosity is enabled. + */ + bool IsVerbose() const; + + /** * Set whether or not this TryCatch should capture a Message object * which holds source information about where the exception * occurred. True by default. diff --git a/deps/v8/src/api.cc b/deps/v8/src/api.cc index 50848c780d..3fbf688b5f 100644 --- a/deps/v8/src/api.cc +++ b/deps/v8/src/api.cc @@ -2395,6 +2395,10 @@ void v8::TryCatch::SetVerbose(bool value) { is_verbose_ = value; } +bool v8::TryCatch::IsVerbose() const { + return is_verbose_; +} + void v8::TryCatch::SetCaptureMessage(bool value) { capture_message_ = value; |