From 8d2c441e4da12361b8770a9d4bc0194a9a5d7177 Mon Sep 17 00:00:00 2001 From: Matheus Marchini Date: Wed, 11 Mar 2020 11:17:41 -0700 Subject: [PATCH] deps: V8: cherry-pick 931bdbd76f5b MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Original commit message: [torque] fix build on VS2017 Node.js build fails on VS2017 without these headers, see the downstream issue (https://github.com/nodejs/node-v8/issues/128). Co-authored-by: Ben Noordhuis Co-authored-by: gengjiawen Change-Id: I771eab435dce5cf548581f3acd78681180c77692 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2093951 Reviewed-by: Tobias Tebbi Commit-Queue: Tobias Tebbi Cr-Commit-Position: refs/heads/master@{#66661} Refs: https://github.com/v8/v8/commit/931bdbd76f5b5416447bf02c8c41fbf64573e537 PR-URL: https://github.com/nodejs/node/pull/32116 Reviewed-By: Michaël Zasso Reviewed-By: Jiawen Geng Reviewed-By: Ruben Bridgewater --- common.gypi | 2 +- deps/v8/src/torque/implementation-visitor.cc | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/common.gypi b/common.gypi index e8942c7a6e7f2a..d9b0a378adbfab 100644 --- a/common.gypi +++ b/common.gypi @@ -35,7 +35,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.8', + 'v8_embedder_string': '-node.9', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/src/torque/implementation-visitor.cc b/deps/v8/src/torque/implementation-visitor.cc index 73f704bcaa081a..ae6ceb3ccff80c 100644 --- a/deps/v8/src/torque/implementation-visitor.cc +++ b/deps/v8/src/torque/implementation-visitor.cc @@ -3964,6 +3964,26 @@ void ImplementationVisitor::GenerateExportedMacrosAssembler( h_contents << "#include \"torque-generated/csa-types-tq.h\"\n"; h_contents << "#include \"torque-generated/internal-class-definitions-tq.h\"\n"; + cc_contents << "#include \"src/objects/free-space.h\"\n"; + cc_contents << "#include \"src/objects/js-regexp-string-iterator.h\"\n"; + cc_contents << "#include \"src/objects/ordered-hash-table.h\"\n"; + cc_contents << "#include \"src/objects/property-descriptor-object.h\"\n"; + cc_contents << "#include \"src/objects/synthetic-module.h\"\n"; + cc_contents << "#include \"src/objects/template-objects.h\"\n"; + { + IfDefScope intl_scope(cc_contents, "V8_INTL_SUPPORT"); + cc_contents << "#include \"src/objects/js-break-iterator.h\"\n"; + cc_contents << "#include \"src/objects/js-collator.h\"\n"; + cc_contents << "#include \"src/objects/js-date-time-format.h\"\n"; + cc_contents << "#include \"src/objects/js-display-names.h\"\n"; + cc_contents << "#include \"src/objects/js-list-format.h\"\n"; + cc_contents << "#include \"src/objects/js-locale.h\"\n"; + cc_contents << "#include \"src/objects/js-number-format.h\"\n"; + cc_contents << "#include \"src/objects/js-plural-rules.h\"\n"; + cc_contents << "#include \"src/objects/js-relative-time-format.h\"\n"; + cc_contents << "#include \"src/objects/js-segment-iterator.h\"\n"; + cc_contents << "#include \"src/objects/js-segmenter.h\"\n"; + } cc_contents << "#include \"torque-generated/" << file_name << ".h\"\n"; for (SourceId file : SourceFileMap::AllSources()) {