diff options
author | daniel.bevenius <daniel.bevenius@gmail.com> | 2017-05-02 03:28:17 -0700 |
---|---|---|
committer | Daniel Bevenius <daniel.bevenius@gmail.com> | 2017-05-16 09:43:50 +0200 |
commit | 986e1d2c6fda62e189bbcc27c856ee0e58adddaf (patch) | |
tree | 13fd9dc9c2c9daae1b6465d17f94aa5a10dd0e96 /deps | |
parent | 0c2edd27e693ef5bb914a25c3257511fe2bb99f6 (diff) | |
download | android-node-v8-986e1d2c6fda62e189bbcc27c856ee0e58adddaf.tar.gz android-node-v8-986e1d2c6fda62e189bbcc27c856ee0e58adddaf.tar.bz2 android-node-v8-986e1d2c6fda62e189bbcc27c856ee0e58adddaf.zip |
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 2cc9821769..ac423bf90e 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 8 #define V8_BUILD_NUMBER 283 -#define V8_PATCH_LEVEL 38 +#define V8_PATCH_LEVEL 39 // 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 baf44170f0..e38f657b48 100644 --- a/deps/v8/include/v8.h +++ b/deps/v8/include/v8.h @@ -7983,6 +7983,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 8ede1071d6..8ce75201c2 100644 --- a/deps/v8/src/api.cc +++ b/deps/v8/src/api.cc @@ -2691,6 +2691,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; |