From 70277d6170b5c18322542b3980564a74c3d8d1b3 Mon Sep 17 00:00:00 2001 From: Myles Borins Date: Wed, 24 Jan 2018 16:51:40 -0800 Subject: [PATCH] deps: V8: resolve remaining whitespace diff MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some whitespace was lost when #17489 landed. While I restored the one file causing the V8-CI to fail, I missed the remaining changes from Myles. This changes restores all whitespace differences with upstream. PR-URL: https://github.com/nodejs/node/pull/18366 Refs: https://github.com/nodejs/node/pull/18360 Reviewed-By: Myles Borins Reviewed-By: Michaël Zasso Reviewed-By: Colin Ihrig Reviewed-By: James M Snell --- .../async-stack-for-promise-expected.txt | 1 + .../external-stack-trace-expected.txt | 4 +- .../debugger/pause-on-async-call-expected.txt | 1 + .../promise-chain-when-limit-hit-expected.txt | 84 +++++++++---------- .../this-in-arrow-function-expected.txt | 1 + deps/v8/test/message/fail/console.out | 1 + .../test/message/regress/fail/regress-73.js | 12 +-- deps/v8/third_party/colorama/LICENSE | 1 + 8 files changed, 55 insertions(+), 50 deletions(-) diff --git a/deps/v8/test/inspector/debugger/async-stack-for-promise-expected.txt b/deps/v8/test/inspector/debugger/async-stack-for-promise-expected.txt index cec05f239bf5..14a357659b68 100644 --- a/deps/v8/test/inspector/debugger/async-stack-for-promise-expected.txt +++ b/deps/v8/test/inspector/debugger/async-stack-for-promise-expected.txt @@ -130,3 +130,4 @@ foo1 (test.js:9:2) -- Promise.finally -- finally2 (test.js:225:34) (anonymous) (testFinally2.js:0:0) + diff --git a/deps/v8/test/inspector/debugger/external-stack-trace-expected.txt b/deps/v8/test/inspector/debugger/external-stack-trace-expected.txt index 3d5ecca11252..fef370e2e818 100644 --- a/deps/v8/test/inspector/debugger/external-stack-trace-expected.txt +++ b/deps/v8/test/inspector/debugger/external-stack-trace-expected.txt @@ -15,10 +15,10 @@ Running test: testInstrumentation callFrames : [ [0] : { columnNumber : 15 - functionName : + functionName : lineNumber : 0 scriptId : - url : + url : } ] description : stack diff --git a/deps/v8/test/inspector/debugger/pause-on-async-call-expected.txt b/deps/v8/test/inspector/debugger/pause-on-async-call-expected.txt index 53fde7bcd2cf..a835810e7abb 100644 --- a/deps/v8/test/inspector/debugger/pause-on-async-call-expected.txt +++ b/deps/v8/test/inspector/debugger/pause-on-async-call-expected.txt @@ -205,3 +205,4 @@ paused at: debugger; createPromise().then(#v => v * 2); } + diff --git a/deps/v8/test/inspector/debugger/promise-chain-when-limit-hit-expected.txt b/deps/v8/test/inspector/debugger/promise-chain-when-limit-hit-expected.txt index 936ed3f86e09..549b1a3ddcd7 100644 --- a/deps/v8/test/inspector/debugger/promise-chain-when-limit-hit-expected.txt +++ b/deps/v8/test/inspector/debugger/promise-chain-when-limit-hit-expected.txt @@ -19,7 +19,7 @@ Run expression 'console.trace()' with async chain len: 3 functionName : asyncCall lineNumber : 2 scriptId : - url : + url : } [1] : { columnNumber : 33 @@ -36,7 +36,7 @@ Run expression 'console.trace()' with async chain len: 3 functionName : asyncCall lineNumber : 5 scriptId : - url : + url : } [1] : { columnNumber : 33 @@ -54,14 +54,14 @@ Run expression 'console.trace()' with async chain len: 3 functionName : asyncCall lineNumber : 5 scriptId : - url : + url : } [1] : { columnNumber : 33 functionName : Promise.resolve.then lineNumber : 5 scriptId : - url : + url : } ] description : Promise.then @@ -72,14 +72,14 @@ Run expression 'console.trace()' with async chain len: 3 functionName : asyncCall lineNumber : 5 scriptId : - url : + url : } [1] : { columnNumber : 4 - functionName : + functionName : lineNumber : 6 scriptId : - url : + url : } ] description : Promise.then @@ -110,7 +110,7 @@ Run expression 'console.trace()' with async chain len: 3 functionName : asyncCall lineNumber : 2 scriptId : - url : + url : } [1] : { columnNumber : 33 @@ -127,7 +127,7 @@ Run expression 'console.trace()' with async chain len: 3 functionName : asyncCall lineNumber : 5 scriptId : - url : + url : } [1] : { columnNumber : 33 @@ -145,14 +145,14 @@ Run expression 'console.trace()' with async chain len: 3 functionName : asyncCall lineNumber : 5 scriptId : - url : + url : } [1] : { columnNumber : 33 functionName : Promise.resolve.then lineNumber : 5 scriptId : - url : + url : } ] description : Promise.then @@ -163,14 +163,14 @@ Run expression 'console.trace()' with async chain len: 3 functionName : asyncCall lineNumber : 5 scriptId : - url : + url : } [1] : { columnNumber : 4 - functionName : + functionName : lineNumber : 6 scriptId : - url : + url : } ] description : Promise.then @@ -201,7 +201,7 @@ Run expression 'console.trace()' with async chain len: 3 functionName : asyncCall lineNumber : 2 scriptId : - url : + url : } [1] : { columnNumber : 33 @@ -218,7 +218,7 @@ Run expression 'console.trace()' with async chain len: 3 functionName : asyncCall lineNumber : 5 scriptId : - url : + url : } [1] : { columnNumber : 33 @@ -236,14 +236,14 @@ Run expression 'console.trace()' with async chain len: 3 functionName : asyncCall lineNumber : 5 scriptId : - url : + url : } [1] : { columnNumber : 33 functionName : Promise.resolve.then lineNumber : 5 scriptId : - url : + url : } ] description : Promise.then @@ -254,14 +254,14 @@ Run expression 'console.trace()' with async chain len: 3 functionName : asyncCall lineNumber : 5 scriptId : - url : + url : } [1] : { columnNumber : 4 - functionName : + functionName : lineNumber : 6 scriptId : - url : + url : } ] description : Promise.then @@ -292,7 +292,7 @@ Run expression 'console.trace()' with async chain len: 3 functionName : asyncCall lineNumber : 2 scriptId : - url : + url : } [1] : { columnNumber : 33 @@ -309,7 +309,7 @@ Run expression 'console.trace()' with async chain len: 3 functionName : asyncCall lineNumber : 5 scriptId : - url : + url : } [1] : { columnNumber : 33 @@ -327,14 +327,14 @@ Run expression 'console.trace()' with async chain len: 3 functionName : asyncCall lineNumber : 5 scriptId : - url : + url : } [1] : { columnNumber : 33 functionName : Promise.resolve.then lineNumber : 5 scriptId : - url : + url : } ] description : Promise.then @@ -345,14 +345,14 @@ Run expression 'console.trace()' with async chain len: 3 functionName : asyncCall lineNumber : 5 scriptId : - url : + url : } [1] : { columnNumber : 4 - functionName : + functionName : lineNumber : 6 scriptId : - url : + url : } ] description : Promise.then @@ -383,7 +383,7 @@ Run expression 'console.trace()' with async chain len: 3 functionName : asyncCall lineNumber : 2 scriptId : - url : + url : } [1] : { columnNumber : 33 @@ -400,7 +400,7 @@ Run expression 'console.trace()' with async chain len: 3 functionName : asyncCall lineNumber : 5 scriptId : - url : + url : } [1] : { columnNumber : 33 @@ -418,14 +418,14 @@ Run expression 'console.trace()' with async chain len: 3 functionName : asyncCall lineNumber : 5 scriptId : - url : + url : } [1] : { columnNumber : 33 functionName : Promise.resolve.then lineNumber : 5 scriptId : - url : + url : } ] description : Promise.then @@ -436,14 +436,14 @@ Run expression 'console.trace()' with async chain len: 3 functionName : asyncCall lineNumber : 5 scriptId : - url : + url : } [1] : { columnNumber : 4 - functionName : + functionName : lineNumber : 6 scriptId : - url : + url : } ] description : Promise.then @@ -474,7 +474,7 @@ Run expression 'console.trace()' with async chain len: 3 functionName : asyncCall lineNumber : 2 scriptId : - url : + url : } [1] : { columnNumber : 33 @@ -491,7 +491,7 @@ Run expression 'console.trace()' with async chain len: 3 functionName : asyncCall lineNumber : 5 scriptId : - url : + url : } [1] : { columnNumber : 33 @@ -509,14 +509,14 @@ Run expression 'console.trace()' with async chain len: 3 functionName : asyncCall lineNumber : 5 scriptId : - url : + url : } [1] : { columnNumber : 33 functionName : Promise.resolve.then lineNumber : 5 scriptId : - url : + url : } ] description : Promise.then @@ -527,14 +527,14 @@ Run expression 'console.trace()' with async chain len: 3 functionName : asyncCall lineNumber : 5 scriptId : - url : + url : } [1] : { columnNumber : 4 - functionName : + functionName : lineNumber : 6 scriptId : - url : + url : } ] description : Promise.then diff --git a/deps/v8/test/inspector/debugger/this-in-arrow-function-expected.txt b/deps/v8/test/inspector/debugger/this-in-arrow-function-expected.txt index 58f1e926d212..3532183b6651 100644 --- a/deps/v8/test/inspector/debugger/this-in-arrow-function-expected.txt +++ b/deps/v8/test/inspector/debugger/this-in-arrow-function-expected.txt @@ -104,3 +104,4 @@ This in evaluateOnCallFrame: type : object } Values equal: false + diff --git a/deps/v8/test/message/fail/console.out b/deps/v8/test/message/fail/console.out index abfc4ad7184b..ab1e412be32d 100644 --- a/deps/v8/test/message/fail/console.out +++ b/deps/v8/test/message/fail/console.out @@ -13,3 +13,4 @@ Error: exception at Object.toString (*%(basename)s:24:39) at console.info () at *%(basename)s:24:9 + diff --git a/deps/v8/test/message/regress/fail/regress-73.js b/deps/v8/test/message/regress/fail/regress-73.js index 137b731fc94a..72652d74a9e7 100644 --- a/deps/v8/test/message/regress/fail/regress-73.js +++ b/deps/v8/test/message/regress/fail/regress-73.js @@ -25,9 +25,9 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -try { - throw 'a'; -} catch (e) { - throw 'b'; - print('c'); -} +try { + throw 'a'; +} catch (e) { + throw 'b'; + print('c'); +} diff --git a/deps/v8/third_party/colorama/LICENSE b/deps/v8/third_party/colorama/LICENSE index 3105888ec149..5f567799f395 100644 --- a/deps/v8/third_party/colorama/LICENSE +++ b/deps/v8/third_party/colorama/LICENSE @@ -25,3 +25,4 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +