summaryrefslogtreecommitdiff
path: root/common.gypi
diff options
context:
space:
mode:
authorMatheus Marchini <matheus@sthima.com>2018-06-11 09:05:33 -0700
committerMatheus Marchini <matheus@sthima.com>2018-06-22 09:43:05 -0700
commit9bdc882d58b172d9b5d960d55c474bf9f0770f78 (patch)
tree27067ad77d312fc9b871030877c88ddd3607204f /common.gypi
parentb3627560a94eaf51262cc041aebc9ef150b5fcbc (diff)
downloadandroid-node-v8-9bdc882d58b172d9b5d960d55c474bf9f0770f78.tar.gz
android-node-v8-9bdc882d58b172d9b5d960d55c474bf9f0770f78.tar.bz2
android-node-v8-9bdc882d58b172d9b5d960d55c474bf9f0770f78.zip
deps: cherry-pick b20faff from upstream V8
Original commit message: [log] fix ExistingCodeLogger behavior on edge case ExistingCodeLogger was behaving incorrectly when the CodeEventHandler API was used in combination with --interpreted-frames-native-stack. Instead of collecting copied trampolines as InterpretedFunction:functionName, they were being collected as Builtin:IntepreterEntryTrampolines. This patch adds special handling for copied trampolines when using ExistingCodeLogger. R=yangguo@google.com Change-Id: I3ee4be03800122d28d53b51b20c60dcf6263e4c1 Reviewed-on: https://chromium-review.googlesource.com/1087813 Reviewed-by: Yang Guo <yangguo@chromium.org> Commit-Queue: Yang Guo <yangguo@chromium.org> Cr-Commit-Position: refs/heads/master@{#53624} Refs: https://github.com/v8/v8/commit/b20faffb07bc97b869a00b935c639bd1c PR-URL: https://github.com/nodejs/node/pull/21126 Refs: https://github.com/v8/v8/commit/aa6ce3e Reviewed-By: Michaƫl Zasso <targos@protonmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'common.gypi')
-rw-r--r--common.gypi2
1 files changed, 1 insertions, 1 deletions
diff --git a/common.gypi b/common.gypi
index 15826a2195..c64e1b4cc8 100644
--- a/common.gypi
+++ b/common.gypi
@@ -27,7 +27,7 @@
# Reset this number to 0 on major V8 upgrades.
# Increment by one for each non-official patch applied to deps/v8.
- 'v8_embedder_string': '-node.10',
+ 'v8_embedder_string': '-node.11',
# Enable disassembler for `--print-code` v8 options
'v8_enable_disassembler': 1,