From 76b64d3f581b8f3600d965ba02907ac1f88651cf Mon Sep 17 00:00:00 2001
From: Refael Ackermann <refack@gmail.com>
Date: Sun, 31 Mar 2019 15:09:45 -0400
Subject: [PATCH 1/6] build: rename v8 PCH files and add new 1/2

---
 .../pch/v8_pch.cc => v8_gypfiles/pch/v8_base_pch.cc}      | 0
 .../{msvs/pch/v8_pch.h => v8_gypfiles/pch/v8_base_pch.h}  | 0
 tools/v8_gypfiles/v8.gyp                                  | 8 ++++----
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename tools/{msvs/pch/v8_pch.cc => v8_gypfiles/pch/v8_base_pch.cc} (100%)
 rename tools/{msvs/pch/v8_pch.h => v8_gypfiles/pch/v8_base_pch.h} (100%)

diff --git a/tools/msvs/pch/v8_pch.cc b/tools/v8_gypfiles/pch/v8_base_pch.cc
similarity index 100%
rename from tools/msvs/pch/v8_pch.cc
rename to tools/v8_gypfiles/pch/v8_base_pch.cc
diff --git a/tools/msvs/pch/v8_pch.h b/tools/v8_gypfiles/pch/v8_base_pch.h
similarity index 100%
rename from tools/msvs/pch/v8_pch.h
rename to tools/v8_gypfiles/pch/v8_base_pch.h
diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
index 72a8dfe56e30fb..01cb52ecf13f80 100644
--- a/tools/v8_gypfiles/v8.gyp
+++ b/tools/v8_gypfiles/v8.gyp
@@ -398,8 +398,8 @@
           },
         ],
         ['OS=="win"', {
-          'msvs_precompiled_header': '<(V8_ROOT)/../../tools/msvs/pch/v8_pch.h',
-          'msvs_precompiled_source': '<(V8_ROOT)/../../tools/msvs/pch/v8_pch.cc',
+          'msvs_precompiled_header': 'pch/v8_base_pch.h',
+          'msvs_precompiled_source': 'pch/v8_base_pch.cc',
           'sources': [
             '<(_msvs_precompiled_header)',
             '<(_msvs_precompiled_source)',
@@ -2026,8 +2026,8 @@
           ],
         }],
         ['OS=="win"', {
-          'msvs_precompiled_header': '<(V8_ROOT)/../../tools/msvs/pch/v8_pch.h',
-          'msvs_precompiled_source': '<(V8_ROOT)/../../tools/msvs/pch/v8_pch.cc',
+          'msvs_precompiled_header': 'pch/v8_base_pch.h',
+          'msvs_precompiled_source': 'pch/v8_base_pch.cc',
           'sources': [
             '<(_msvs_precompiled_header)',
             '<(_msvs_precompiled_source)',

From d933bd1261f39432e5d2822f6b7935b2cf3d849b Mon Sep 17 00:00:00 2001
From: Refael Ackermann <refack@gmail.com>
Date: Sun, 31 Mar 2019 16:45:09 -0400
Subject: [PATCH 2/6] build: rename v8 PCH files and add new 2/2

---
 tools/v8_gypfiles/pch/v8_base_pch.cc         |   2 +-
 tools/v8_gypfiles/pch/v8_base_pch.h          | 168 ++++++++++++++++++-
 tools/v8_gypfiles/pch/v8_initializers_pch.cc |   1 +
 tools/v8_gypfiles/pch/v8_initializers_pch.h  |  73 ++++++++
 tools/v8_gypfiles/v8.gyp                     |   4 +-
 5 files changed, 244 insertions(+), 4 deletions(-)
 create mode 100644 tools/v8_gypfiles/pch/v8_initializers_pch.cc
 create mode 100644 tools/v8_gypfiles/pch/v8_initializers_pch.h

diff --git a/tools/v8_gypfiles/pch/v8_base_pch.cc b/tools/v8_gypfiles/pch/v8_base_pch.cc
index 03a5d999d36d9d..284bb4ce7aeabd 100644
--- a/tools/v8_gypfiles/pch/v8_base_pch.cc
+++ b/tools/v8_gypfiles/pch/v8_base_pch.cc
@@ -1 +1 @@
-#include "v8_pch.h"
+#include "v8_base_pch.h"
diff --git a/tools/v8_gypfiles/pch/v8_base_pch.h b/tools/v8_gypfiles/pch/v8_base_pch.h
index 2c543beac2111b..dbf3f126ade9fc 100644
--- a/tools/v8_gypfiles/pch/v8_base_pch.h
+++ b/tools/v8_gypfiles/pch/v8_base_pch.h
@@ -1,3 +1,169 @@
+#include "include/v8.h"
+#include "include/v8-profiler.h"
+#include "include/v8-testing.h"
+#include "include/v8-util.h"
+#include "src/accessors.h"
+#include "src/allocation-site-scopes.h"
+#include "src/api.h"
+#include "src/api-arguments-inl.h"
 #include "src/api-inl.h"
+#include "src/api-natives.h"
+#include "src/arguments.h"
+#include "src/assert-scope.h"
+#include "src/ast/ast.h"
+#include "src/ast/scopes.h"
+#include "src/base/bits.h"
+#include "src/base/functional.h"
+#include "src/base/logging.h"
+#include "src/base/overflowing-math.h"
+#include "src/base/platform/platform.h"
+#include "src/base/platform/time.h"
+#include "src/base/safe_conversions.h"
+#include "src/base/utils/random-number-generator.h"
+#include "src/bootstrapper.h"
+#include "src/builtins/builtins.h"
+#include "src/builtins/builtins-utils.h"
+#include "src/char-predicates-inl.h"
+#include "src/code-factory.h"
+// Problematic #include "src/code-stub-assembler.h"
+#include "src/compiler.h"
+#include "src/compiler-dispatcher/compiler-dispatcher.h"
+#include "src/contexts.h"
+#include "src/conversions-inl.h"
+#include "src/counters.h"
+#include "src/counters-inl.h"
+#include "src/cpu-features.h"
+#include "src/date.h"
+#include "src/debug/debug.h"
+#include "src/debug/debug-coverage.h"
+#include "src/debug/debug-evaluate.h"
+#include "src/debug/debug-type-profile.h"
+#include "src/debug/liveedit.h"
+#include "src/deoptimizer.h"
+#include "src/detachable-vector.h"
+#include "src/elements.h"
+#include "src/execution.h"
+#include "src/field-index.h"
+#include "src/field-index-inl.h"
+#include "src/field-type.h"
+#include "src/frames.h"
+#include "src/frames-inl.h"
+#include "src/function-kind.h"
+#include "src/gdb-jit.h"
+#include "src/global-handles.h"
+#include "src/globals.h"
+#include "src/heap/heap-inl.h"
+#include "src/heap/read-only-heap.h"
+#include "src/ic/ic.h"
+#include "src/icu_util.h"
+#include "src/identity-map.h"
+#include "src/isolate-inl.h"
+#include "src/json-parser.h"
+#include "src/json-stringifier.h"
+#include "src/keys.h"
+#include "src/log.h"
+#include "src/lookup-inl.h"
+#include "src/map-updater.h"
+#include "src/messages.h"
+#include "src/message-template.h"
+#include "src/microtask-queue.h"
+#include "src/objects.h"
+#include "src/objects/allocation-site-inl.h"
+#include "src/objects/api-callbacks.h"
+#include "src/objects/arguments-inl.h"
+#include "src/objects/bigint.h"
+#include "src/objects/cell.h"
+#include "src/objects/cell-inl.h"
+#include "src/objects/code-inl.h"
+#include "src/objects/compilation-cache-inl.h"
+#include "src/objects/debug-objects-inl.h"
+#include "src/objects/descriptor-array.h"
+#include "src/objects/embedder-data-array-inl.h"
+#include "src/objects/embedder-data-slot-inl.h"
+#include "src/objects/foreign.h"
+#include "src/objects/frame-array-inl.h"
+#include "src/objects/free-space-inl.h"
+#include "src/objects/hash-table-inl.h"
+#include "src/objects/heap-number.h"
+#include "src/objects/heap-object.h"
+#include "src/objects/js-array-inl.h"
+#include "src/objects/js-collection-inl.h"
+#include "src/objects/js-generator-inl.h"
+#include "src/objects/js-promise-inl.h"
+#include "src/objects/js-regexp-inl.h"
+#include "src/objects/js-regexp-string-iterator.h"
+#include "src/objects/js-weak-refs-inl.h"
+#include "src/objects/literal-objects-inl.h"
+#include "src/objects/map.h"
+#include "src/objects/map-inl.h"
+#include "src/objects/microtask-inl.h"
+#include "src/objects/module-inl.h"
+#include "src/objects/oddball.h"
+#include "src/objects/ordered-hash-table-inl.h"
+#include "src/objects/promise-inl.h"
+#include "src/objects/property-cell.h"
+#include "src/objects/slots.h"
+#include "src/objects/slots-atomic-inl.h"
+#include "src/objects/smi.h"
+#include "src/objects/stack-frame-info-inl.h"
+#include "src/objects/string-comparator.h"
+#include "src/objects/struct-inl.h"
+#include "src/objects/templates.h"
+#include "src/objects-body-descriptors-inl.h"
 #include "src/objects-inl.h"
-#include "src/utils.h"
+#include "src/ostreams.h"
+#include "src/parsing/parse-info.h"
+#include "src/parsing/parser.h"
+#include "src/parsing/preparse-data.h"
+#include "src/parsing/scanner-character-streams.h"
+#include "src/pending-compilation-error-handler.h"
+#include "src/profiler/cpu-profiler.h"
+#include "src/profiler/heap-profiler.h"
+#include "src/profiler/heap-snapshot-generator-inl.h"
+#include "src/profiler/profile-generator-inl.h"
+#include "src/profiler/tick-sample.h"
+#include "src/property.h"
+#include "src/property-descriptor.h"
+#include "src/property-details.h"
+#include "src/prototype.h"
+#include "src/regexp/jsregexp.h"
+#include "src/runtime/runtime.h"
+#include "src/runtime-profiler.h"
+#include "src/simulator.h"
+#include "src/snapshot/code-serializer.h"
+#include "src/snapshot/natives.h"
+#include "src/snapshot/partial-serializer.h"
+#include "src/snapshot/read-only-serializer.h"
+#include "src/snapshot/snapshot.h"
+#include "src/snapshot/startup-serializer.h"
+#include "src/source-position-table.h"
+#include "src/startup-data-util.h"
+#include "src/string-builder-inl.h"
+#include "src/string-hasher.h"
+#include "src/string-search.h"
+#include "src/string-stream.h"
+#include "src/tracing/trace-event.h"
+#include "src/transitions-inl.h"
+#include "src/trap-handler/trap-handler.h"
+#include "src/unicode-decoder.h"
+#include "src/unicode-inl.h"
+#include "src/utils-inl.h"
+#include "src/v8.h"
+#include "src/v8threads.h"
+#include "src/value-serializer.h"
+#include "src/version.h"
+#include "src/vm-state-inl.h"
+#include "src/wasm/streaming-decoder.h"
+#include "src/wasm/wasm-engine.h"
+#include "src/wasm/wasm-objects.h"
+#include "src/wasm/wasm-objects-inl.h"
+#include "src/wasm/wasm-result.h"
+#include "src/wasm/wasm-serialization.h"
+#include "src/zone/zone.h"
+#include <algorithm>
+#include <cmath>
+#include <limits>
+#include <memory>
+#include <sstream>
+#include <string.h>
+#include <vector>
diff --git a/tools/v8_gypfiles/pch/v8_initializers_pch.cc b/tools/v8_gypfiles/pch/v8_initializers_pch.cc
new file mode 100644
index 00000000000000..dd77f73e118652
--- /dev/null
+++ b/tools/v8_gypfiles/pch/v8_initializers_pch.cc
@@ -0,0 +1 @@
+#include "v8_initializers_pch.h"
diff --git a/tools/v8_gypfiles/pch/v8_initializers_pch.h b/tools/v8_gypfiles/pch/v8_initializers_pch.h
new file mode 100644
index 00000000000000..e64ca19d2942b3
--- /dev/null
+++ b/tools/v8_gypfiles/pch/v8_initializers_pch.h
@@ -0,0 +1,73 @@
+// From all the torque generated files
+#include "src/builtins/builtins-utils-gen.h"
+#include "src/builtins/builtins.h"
+#include "src/code-factory.h"
+#include "src/elements-kind.h"
+#include "src/heap/factory-inl.h"
+#include "src/objects.h"
+#include "src/objects/arguments.h"
+#include "src/objects/bigint.h"
+#include "src/objects/js-generator.h"
+#include "src/objects/js-promise.h"
+#include "src/objects/module.h"
+#include "src/objects/stack-frame-info.h"
+#include "src/builtins/builtins-array-gen.h"
+#include "src/builtins/builtins-collections-gen.h"
+#include "src/builtins/builtins-data-view-gen.h"
+#include "src/builtins/builtins-iterator-gen.h"
+#include "src/builtins/builtins-regexp-gen.h"
+#include "src/builtins/builtins-typed-array-gen.h"
+#include "src/builtins/builtins-constructor-gen.h"
+#include "src/builtins/builtins-typed-array-gen.h"
+#include "src/builtins/builtins-typed-array-gen.h"
+#include "src/builtins/builtins-typed-array-gen.h"
+#include "src/builtins/builtins-typed-array-gen.h"
+#include "torque-generated/builtins-base-from-dsl-gen.h"
+#include "torque-generated/builtins-growable-fixed-array-from-dsl-gen.h"
+#include "torque-generated/builtins-arguments-from-dsl-gen.h"
+#include "torque-generated/builtins-array-from-dsl-gen.h"
+#include "torque-generated/builtins-array-copywithin-from-dsl-gen.h"
+#include "torque-generated/builtins-array-filter-from-dsl-gen.h"
+#include "torque-generated/builtins-array-find-from-dsl-gen.h"
+#include "torque-generated/builtins-array-findindex-from-dsl-gen.h"
+#include "torque-generated/builtins-array-foreach-from-dsl-gen.h"
+#include "torque-generated/builtins-array-join-from-dsl-gen.h"
+#include "torque-generated/builtins-array-lastindexof-from-dsl-gen.h"
+#include "torque-generated/builtins-array-of-from-dsl-gen.h"
+#include "torque-generated/builtins-array-map-from-dsl-gen.h"
+#include "torque-generated/builtins-array-reverse-from-dsl-gen.h"
+#include "torque-generated/builtins-array-slice-from-dsl-gen.h"
+#include "torque-generated/builtins-array-splice-from-dsl-gen.h"
+#include "torque-generated/builtins-array-unshift-from-dsl-gen.h"
+#include "torque-generated/builtins-collections-from-dsl-gen.h"
+#include "torque-generated/builtins-data-view-from-dsl-gen.h"
+#include "torque-generated/builtins-extras-utils-from-dsl-gen.h"
+#include "torque-generated/builtins-object-from-dsl-gen.h"
+#include "torque-generated/builtins-iterator-from-dsl-gen.h"
+#include "torque-generated/builtins-string-from-dsl-gen.h"
+#include "torque-generated/builtins-typed-array-from-dsl-gen.h"
+#include "torque-generated/builtins-typed-array-createtypedarray-from-dsl-gen.h"
+#include "torque-generated/builtins-typed-array-filter-from-dsl-gen.h"
+#include "torque-generated/builtins-typed-array-foreach-from-dsl-gen.h"
+#include "torque-generated/builtins-typed-array-reduce-from-dsl-gen.h"
+#include "torque-generated/builtins-typed-array-reduceright-from-dsl-gen.h"
+#include "torque-generated/builtins-typed-array-slice-from-dsl-gen.h"
+#include "torque-generated/builtins-typed-array-subarray-from-dsl-gen.h"
+
+// From src/builtins/setup-builtins-internal.cc
+#include "src/setup-isolate.h"
+#include "src/assembler-inl.h"
+// Duplicate #include "src/builtins/builtins.h"
+#include "src/code-events.h"
+#include "src/compiler/code-assembler.h"
+#include "src/handles-inl.h"
+#include "src/heap/heap-inl.h"  // For MemoryAllocator::code_range.
+#include "src/interface-descriptors.h"
+#include "src/interpreter/bytecodes.h"
+#include "src/interpreter/interpreter-generator.h"
+#include "src/interpreter/interpreter.h"
+#include "src/isolate.h"
+#include "src/macro-assembler.h"
+#include "src/objects-inl.h"
+#include "src/objects/shared-function-info.h"
+#include "src/objects/smi.h"
\ No newline at end of file
diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
index 01cb52ecf13f80..8f22ee7be6b37e 100644
--- a/tools/v8_gypfiles/v8.gyp
+++ b/tools/v8_gypfiles/v8.gyp
@@ -398,8 +398,8 @@
           },
         ],
         ['OS=="win"', {
-          'msvs_precompiled_header': 'pch/v8_base_pch.h',
-          'msvs_precompiled_source': 'pch/v8_base_pch.cc',
+          'msvs_precompiled_header': 'pch/v8_initializers_pch.h',
+          'msvs_precompiled_source': 'pch/v8_initializers_pch.cc',
           'sources': [
             '<(_msvs_precompiled_header)',
             '<(_msvs_precompiled_source)',

From 22858fa19cbcf24537bb2449a0a432ed399dae49 Mon Sep 17 00:00:00 2001
From: Refael Ackermann <refack@gmail.com>
Date: Fri, 12 Apr 2019 15:09:54 -0400
Subject: [PATCH 3/6] build: include PCH dir when using PCH

This is to enable better clcache integration
---
 node.gypi                | 3 +++
 tools/v8_gypfiles/v8.gyp | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/node.gypi b/node.gypi
index d6c4c2669834bf..30e7941c192344 100644
--- a/node.gypi
+++ b/node.gypi
@@ -62,6 +62,9 @@
         '<(_msvs_precompiled_header)',
         '<(_msvs_precompiled_source)',
       ],
+      'include_dirs': [
+        'tools/msvs/pch',
+      ],
     }, { # POSIX
       'defines': [ '__POSIX__' ],
     }],
diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
index 8f22ee7be6b37e..ed59a6610dd4db 100644
--- a/tools/v8_gypfiles/v8.gyp
+++ b/tools/v8_gypfiles/v8.gyp
@@ -404,6 +404,9 @@
             '<(_msvs_precompiled_header)',
             '<(_msvs_precompiled_source)',
            ],
+          'include_dirs': [
+            'pch',
+          ],
         }],
       ],
     }, # v8_initializers
@@ -2032,6 +2035,9 @@
             '<(_msvs_precompiled_header)',
             '<(_msvs_precompiled_source)',
           ],
+          'include_dirs': [
+            'pch',
+          ],
           # This will prevent V8's .cc files conflicting with the inspector's
           # .cpp files in the same shard.
           'msvs_settings': {

From a60189000c9d3a96d74d807576d6eff79b1ccaf8 Mon Sep 17 00:00:00 2001
From: Refael Ackermann <refack@gmail.com>
Date: Mon, 8 Apr 2019 16:52:12 -0400
Subject: [PATCH 4/6] build: V8 workaround for MSVC 14.20 bug

Refs: https://developercommunity.visualstudio.com/content/problem/512352/compiler-doesnt-finish-142027508.html
---
 tools/v8_gypfiles/v8.gyp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
index ed59a6610dd4db..3ac28fc53f6046 100644
--- a/tools/v8_gypfiles/v8.gyp
+++ b/tools/v8_gypfiles/v8.gyp
@@ -409,6 +409,22 @@
           ],
         }],
       ],
+      'configurations': {
+        'Debug': {
+          'msvs_settings': {
+            'VCCLCompilerTool': {
+              'AdditionalOptions': [ '-d2SSAOptimizer-' ], # Workaround VS2019 bug https://developercommunity.visualstudio.com/content/problem/512352/compiler-doesnt-finish-142027508.html
+            },
+          },
+        },
+        'Release': {
+          'msvs_settings': {
+            'VCCLCompilerTool': {
+              'AdditionalOptions': [ '-d2SSAOptimizer-' ], # Workaround VS2019 bug https://developercommunity.visualstudio.com/content/problem/512352/compiler-doesnt-finish-142027508.html
+            },
+          },
+        },
+      },
     }, # v8_initializers
     {
       'target_name': 'v8_snapshot',

From 34eac84204baf63984eb577af669dfd17159dba0 Mon Sep 17 00:00:00 2001
From: Refael Ackermann <refack@gmail.com>
Date: Mon, 8 Apr 2019 16:53:43 -0400
Subject: [PATCH 5/6] build: V8 toolchain.gypi dedup and comment

---
 tools/v8_gypfiles/toolchain.gypi | 209 +++++++++++++------------------
 1 file changed, 90 insertions(+), 119 deletions(-)

diff --git a/tools/v8_gypfiles/toolchain.gypi b/tools/v8_gypfiles/toolchain.gypi
index 64914284e7efd7..de2280ab6d463f 100644
--- a/tools/v8_gypfiles/toolchain.gypi
+++ b/tools/v8_gypfiles/toolchain.gypi
@@ -293,7 +293,7 @@
         'defines': [
           'V8_TARGET_ARCH_ARM64',
         ],
-      }],
+      }],  # v8_target_arch=="arm64"
       ['v8_target_arch=="s390" or v8_target_arch=="s390x"', {
         'defines': [
           'V8_TARGET_ARCH_S390',
@@ -312,7 +312,7 @@
             'cflags': [ '-march=z196' ],
           }],
           ],
-      }],  # s390
+      }],  # v8_target_arch=="s390*"
       ['v8_target_arch=="ppc" or v8_target_arch=="ppc64"', {
         'defines': [
           'V8_TARGET_ARCH_PPC',
@@ -344,7 +344,7 @@
             ],
           }],
         ],
-      }],  # ppc
+      }],  # v8_target_arch=="ppc**"
       ['v8_target_arch=="ia32"', {
         'defines': [
           'V8_TARGET_ARCH_IA32',
@@ -392,7 +392,7 @@
             ],
           }],  #'_toolset=="host"
         ],
-      }],
+      }],  # v8_target_arch=="mips***"
       ['v8_target_arch=="mips"', {
         'defines': [
           'V8_TARGET_ARCH_MIPS',
@@ -982,12 +982,12 @@
         # selection.
         # gcc -- http://gcc.gnu.org/onlinedocs/gcc-4.8.0/gcc/Optimize-Options.html
         'ldflags': [ '-fuse-ld=gold', ],
-      }],
+      }],  # linux_use_gold_flags==1
       ['linux_use_bundled_binutils==1', {
         'cflags': [
           '-B<!(cd <(DEPTH) && pwd -P)/<(binutils_dir)',
         ],
-      }],
+      }],  # linux_use_bundled_binutils==1
       ['linux_use_bundled_gold==1', {
         # Put our binutils, which contains gold in the search path. We pass
         # the path to gold to the compiler. gyp leaves unspecified what the
@@ -996,19 +996,13 @@
         'ldflags': [
           '-B<!(cd <(DEPTH) && pwd -P)/<(binutils_dir)',
         ],
-      }],
+      }],  # linux_use_bundled_gold==1
       ['OS=="win"', {
         'defines': [
           'WIN32',
           'NOMINMAX',  # Refs: https://chromium-review.googlesource.com/c/v8/v8/+/1456620
         ],
-        # 4351: VS 2005 and later are warning us that they've fixed a bug
-        #       present in VS 2003 and earlier.
-        'msvs_disabled_warnings': [4351],
-        'msvs_configuration_attributes': {
-          'CharacterSet': '1',
-        },
-      }],
+      }],  # OS=="win"
       ['OS=="win" and v8_target_arch=="ia32"', {
         'msvs_settings': {
           'VCCLCompilerTool': {
@@ -1016,14 +1010,14 @@
             'AdditionalOptions': ['/arch:SSE2'],
           },
         },
-      }],
+      }],  # OS=="win" and v8_target_arch=="ia32"
       ['OS=="win" and v8_enable_prof==1', {
         'msvs_settings': {
           'VCLinkerTool': {
             'GenerateMapFile': 'true',
           },
         },
-      }],
+      }],  # OS=="win" and v8_enable_prof==1
       ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
          or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \
         v8_target_arch=="ia32"', {
@@ -1032,7 +1026,7 @@
           '-mfpmath=sse',
           '-mmmx',  # Allows mmintrin.h for MMX intrinsics.
         ],
-      }],
+      }],  # OS==POSIXish and v8_target_arch=="ia32"
       ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
          or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \
         (v8_target_arch=="arm" or v8_target_arch=="ia32" or \
@@ -1076,7 +1070,7 @@
             },
           }],
         ],
-      }],
+      }],  # OS==POSIXish and v8_target_arch==32bit-ish
       ['(OS=="linux" or OS=="android") and \
         (v8_target_arch=="x64" or v8_target_arch=="arm64" or \
          v8_target_arch=="ppc64" or v8_target_arch=="s390x")', {
@@ -1098,12 +1092,12 @@
              ]
            }],
          ],
-      }],
+      }],  # (OS=="linux" or OS=="android") v8_target_arch==54bit-ish
       ['OS=="android" and v8_android_log_stdout==1', {
         'defines': [
           'V8_ANDROID_LOG_STDOUT',
         ],
-      }],
+      }],  # OS=="android" and v8_android_log_stdout==1
       ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
          or OS=="netbsd" or OS=="qnx" or OS=="aix"', {
         'conditions': [
@@ -1111,16 +1105,16 @@
             'cflags': [ '-fno-strict-aliasing' ],
           }],
         ],  # conditions
-      }],
+      }],  # OS==POSIXish
       ['OS=="solaris"', {
         'defines': [ '__C99FEATURES__=1' ],  # isinf() etc.
-      }],
+      }],  # OS=="solaris"
       ['OS=="freebsd" or OS=="openbsd"', {
         'cflags': [ '-I/usr/local/include' ],
-      }],
+      }],  # OS=="freebsd" or OS=="openbsd"
       ['OS=="netbsd"', {
         'cflags': [ '-I/usr/pkg/include' ],
-      }],
+      }],  # OS=="netbsd"
       ['OS=="aix"', {
         'defines': [
           # Support for malloc(0)
@@ -1136,7 +1130,7 @@
             'ldflags': [ '-maix64 -Wl,-bbigtoc' ],
           }],
         ],
-      }],
+      }],  # OS=="aix"
     ],  # conditions
     'configurations': {
       'Debug': {
@@ -1151,27 +1145,21 @@
           'V8_ENABLE_FORCE_SLOW_PATH',
         ],
         'conditions': [
-          ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" or \
-            OS=="qnx" or OS=="aix"', {
+          ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" or OS=="qnx" or OS=="aix"', {
             'cflags': [ '-Woverloaded-virtual', '<(wno_array_bounds)', ],
-          }],
+          }],  # OS==POSIXish
           ['OS=="linux" and v8_enable_backtrace==1', {
             # Support for backtrace_symbols.
             'ldflags': [ '-rdynamic' ],
-          }],
+          }],  # OS=="linux" and v8_enable_backtrace==1
           ['OS=="linux" and disable_glibcxx_debug==0', {
-            # Enable libstdc++ debugging facilities to help catch problems
-            # early, see http://crbug.com/65151 .
+            # Enable libstdc++ debugging facilities to help catch problems early, see http://crbug.com/65151 .
             'defines': ['_GLIBCXX_DEBUG=1',],
-          }],
+          }],  # OS=="linux" and disable_glibcxx_debug==0
           ['OS=="aix"', {
             'ldflags': [ '-Wl,-bbigtoc' ],
-            'conditions': [
-              ['v8_target_arch=="ppc64"', {
-                'cflags': [ '-maix64 -mcmodel=large' ],
-              }],
-            ],
-          }],
+            'cflags': [ '-maix64 -mcmodel=large' ],
+          }],  # OS=="aix"
           ['OS=="android"', {
             'variables': {
               'android_full_debug%': 1,
@@ -1186,22 +1174,20 @@
                 ],
               }],
             ],
-          }],
+          }],  # OS=="android"
           ['linux_use_gold_flags==1', {
             'target_conditions': [
               ['_toolset=="target"', {
                 'ldflags': [
-                  # Experimentation found that using four linking threads
-                  # saved ~20% of link time.
+                  # Experimentation found that using four linking threads saved ~20% of link time.
                   # https://groups.google.com/a/chromium.org/group/chromium-dev/browse_thread/thread/281527606915bb36
-                  # Only apply this to the target linker, since the host
-                  # linker might not be gold, but isn't used much anyway.
+                  # Only apply this to the target linker, since the host linker might not be gold, but isn't used much anyway.
                   '-Wl,--threads',
                   '-Wl,--thread-count=4',
                 ],
               }],
             ],
-          }],
+          }],  # linux_use_gold_flags==1
           ['v8_optimized_debug==0', {
             'msvs_settings': {
               'VCCLCompilerTool': {
@@ -1210,20 +1196,22 @@
                   ['component=="shared_library" or force_dynamic_crt==1', {
                     'RuntimeLibrary': '3',  # /MDd
                   }, {
-                     'RuntimeLibrary': '1',  # /MTd
-                   }],
+                    'RuntimeLibrary': '1',  # /MTd
+                  }],
                 ],
               },
               'VCLinkerTool': {
                 'LinkIncremental': '2',
               },
             },
+            'xcode_settings': {
+              'GCC_OPTIMIZATION_LEVEL': '0',  # -O0
+            },
             'variables': {
               'v8_enable_slow_dchecks%': 1,
             },
             'conditions': [
-              ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" or \
-            OS=="qnx" or OS=="aix"', {
+              ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" or OS=="qnx" or OS=="aix"', {
                 'cflags!': [
                   '-O3',
                   '-O2',
@@ -1235,11 +1223,6 @@
                   '-ffunction-sections',
                 ],
               }],
-              ['OS=="mac"', {
-                'xcode_settings': {
-                  'GCC_OPTIMIZATION_LEVEL': '0',  # -O0
-                },
-              }],
               ['v8_enable_slow_dchecks==1', {
                 'defines': [
                   'ENABLE_SLOW_DCHECKS',
@@ -1250,7 +1233,7 @@
             'msvs_settings': {
               'VCCLCompilerTool': {
                 'Optimization': '2',
-                'InlineFunctionExpansion': '2',
+                'InlineFunctionExpansion': '0',
                 'EnableIntrinsicFunctions': 'true',
                 'FavorSizeOrSpeed': '0',
                 'StringPooling': 'true',
@@ -1269,12 +1252,15 @@
                 'EnableCOMDATFolding': '2',
               },
             },
+            'xcode_settings': {
+              'GCC_OPTIMIZATION_LEVEL': '3',  # -O3
+              'GCC_STRICT_ALIASING': 'YES',
+            },
             'variables': {
               'v8_enable_slow_dchecks%': 0,
             },
             'conditions': [
-              ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" or \
-            OS=="qnx" or OS=="aix"', {
+              ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" or OS=="qnx" or OS=="aix"', {
                 'cflags!': [
                   '-O0',
                   '-O1',
@@ -1285,34 +1271,26 @@
                   '-ffunction-sections',
                 ],
                 'conditions': [
-                  # Don't use -O3 with sanitizers.
-                  ['asan==0 and msan==0 and lsan==0 \
-                and tsan==0 and ubsan==0 and ubsan_vptr==0', {
-                    'cflags': ['-O3'],
+                  # Use -O3 only when no sanitizers.
+                  ['asan==0 and msan==0 and lsan==0 and tsan==0 and ubsan==0 and ubsan_vptr==0', {
                     'cflags!': ['-O2'],
+                    'cflags': ['-O3'],
                   }, {
-                     'cflags': ['-O2'],
-                     'cflags!': ['-O3'],
-                   }],
+                    'cflags!': ['-O3'],
+                    'cflags': ['-O2'],
+                  }],
                 ],
               }],
-              ['OS=="mac"', {
-                'xcode_settings': {
-                  'GCC_OPTIMIZATION_LEVEL': '3',  # -O3
-                  'GCC_STRICT_ALIASING': 'YES',
-                },
-              }],
               ['v8_enable_slow_dchecks==1', {
                 'defines': [
                   'ENABLE_SLOW_DCHECKS',
                 ],
               }],
             ],
-          }],
-          # Temporary refs: https://github.com/nodejs/node/pull/23801
+          }],  # v8_optimized_debug==0
           ['v8_enable_handle_zapping==1', {
             'defines': ['ENABLE_HANDLE_ZAPPING',],
-          }],
+          }],  # v8_enable_handle_zapping==1
         ],
 
       },  # DebugBaseCommon
@@ -1322,9 +1300,38 @@
         },
          # Temporary refs: https://github.com/nodejs/node/pull/23801
         'defines!': ['ENABLE_HANDLE_ZAPPING',],
+        'msvs_settings': {
+          'VCCLCompilerTool': {
+            'Optimization': '2',
+            'InlineFunctionExpansion': '2',
+            'EnableIntrinsicFunctions': 'true',
+            'FavorSizeOrSpeed': '0',
+            'StringPooling': 'true',
+            'conditions': [
+              ['component=="shared_library" or force_dynamic_crt==1', {
+                'RuntimeLibrary': '2',  #/MD
+              }, {
+                'RuntimeLibrary': '0',  #/MT
+              }],
+            ],
+          },
+          'VCLinkerTool': {
+            'LinkIncremental': '1',
+            'OptimizeReferences': '2',
+            'EnableCOMDATFolding': '2',
+          },
+        },
+        'xcode_settings': {
+          'GCC_OPTIMIZATION_LEVEL': '3',  # -O3
+
+          # -fstrict-aliasing.  Mainline gcc
+          # enables this at -O2 and above,
+          # but Apple gcc does not unless it
+          # is specified explicitly.
+          'GCC_STRICT_ALIASING': 'YES',
+        },
         'conditions': [
-          ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" \
-            or OS=="aix"', {
+          ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" or OS=="aix"', {
             'cflags!': [
               '-Os',
             ],
@@ -1335,13 +1342,12 @@
             ],
             'conditions': [
               # Don't use -O3 with sanitizers.
-              ['asan==0 and msan==0 and lsan==0 \
-                and tsan==0 and ubsan==0 and ubsan_vptr==0', {
-                'cflags': ['-O3'],
+              ['asan==0 and msan==0 and lsan==0 and tsan==0 and ubsan==0 and ubsan_vptr==0', {
                 'cflags!': ['-O2'],
+                'cflags': ['-O3'],
               }, {
-                'cflags': ['-O2'],
                 'cflags!': ['-O3'],
+                'cflags': ['-O2'],
               }],
             ],
           }],
@@ -1356,40 +1362,6 @@
               '-O2',
             ],
           }],
-          ['OS=="mac"', {
-            'xcode_settings': {
-              'GCC_OPTIMIZATION_LEVEL': '3',  # -O3
-
-              # -fstrict-aliasing.  Mainline gcc
-              # enables this at -O2 and above,
-              # but Apple gcc does not unless it
-              # is specified explicitly.
-              'GCC_STRICT_ALIASING': 'YES',
-            },
-          }],  # OS=="mac"
-          ['OS=="win"', {
-            'msvs_settings': {
-              'VCCLCompilerTool': {
-                'Optimization': '2',
-                'InlineFunctionExpansion': '2',
-                'EnableIntrinsicFunctions': 'true',
-                'FavorSizeOrSpeed': '0',
-                'StringPooling': 'true',
-                'conditions': [
-                  ['component=="shared_library" or force_dynamic_crt==1', {
-                    'RuntimeLibrary': '2',  #/MD
-                  }, {
-                    'RuntimeLibrary': '0',  #/MT
-                  }],
-                ],
-              },
-              'VCLinkerTool': {
-                'LinkIncremental': '1',
-                'OptimizeReferences': '2',
-                'EnableCOMDATFolding': '2',
-              },
-            },
-          }],  # OS=="win"
           ['v8_enable_slow_dchecks==1', {
             'defines': [
               'ENABLE_SLOW_DCHECKS',
@@ -1399,23 +1371,22 @@
       },  # Release
     },  # configurations
     'cflags!': [ '-Wall', '-Wextra' ],
+    'msvs_configuration_attributes': {
+      'CharacterSet': '1',
+    },
     'msvs_disabled_warnings': [
       4129,  # unrecognized character escape sequence (torque-generated)
       4245,  # Conversion with signed/unsigned mismatch.
       4267,  # Conversion with possible loss of data.
       4324,  # Padding structure due to alignment.
-      4351,
-      4355,
+      4351,  # VS 2005 and later are warning us that they've fixed a bug present in VS 2003 and earlier.
+      4355,  # 'this' : used in base member initializer list
       4701,  # Potentially uninitialized local variable.
       4702,  # Unreachable code.
       4703,  # Potentially uninitialized local pointer variable.
       4709,  # Comma operator within array index expr (bugged).
       4714,  # Function marked forceinline not inlined.
-
-      # MSVC assumes that control can get past an exhaustive switch and then
-      # warns if there's no return there (see https://crbug.com/v8/7658)
-      4715,  # Not all control paths return a value.
-
+      4715,  # Not all control paths return a value. MSVC assumes that control can get past an exhaustive switch (see https://crbug.com/v8/7658)
       4718,  # Recursive call has no side-effect.
       4723,  # https://crbug.com/v8/7771
       4724,  # https://crbug.com/v8/7771

From 55013051abbe09f88139cf73272dceeb06ab1825 Mon Sep 17 00:00:00 2001
From: Refael Ackermann <refack@gmail.com>
Date: Sat, 6 Apr 2019 14:22:06 -0400
Subject: [PATCH 6/6] build: move tourqe and inspector codegen

* Turn them into a `none` target
---
 Makefile                                      |   2 +-
 .../inspector_protocol.gypi                   |  34 ---
 tools/v8_gypfiles/inspector.gypi              | 130 -----------
 tools/v8_gypfiles/v8.gyp                      | 203 +++++++++++++++---
 4 files changed, 178 insertions(+), 191 deletions(-)
 delete mode 100644 deps/v8/third_party/inspector_protocol/inspector_protocol.gypi
 delete mode 100644 tools/v8_gypfiles/inspector.gypi

diff --git a/Makefile b/Makefile
index 346f355ea7a298..6924d349513422 100644
--- a/Makefile
+++ b/Makefile
@@ -126,7 +126,7 @@ test-code-cache: with-code-cache
 out/Makefile: config.gypi common.gypi node.gyp \
   deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp \
   tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \
-  tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp
+  tools/v8_gypfiles/v8.gyp
 	$(PYTHON) tools/gyp_node.py -f make
 
 config.gypi: configure configure.py
diff --git a/deps/v8/third_party/inspector_protocol/inspector_protocol.gypi b/deps/v8/third_party/inspector_protocol/inspector_protocol.gypi
deleted file mode 100644
index 3d0a60e1395241..00000000000000
--- a/deps/v8/third_party/inspector_protocol/inspector_protocol.gypi
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
-  'variables': {
-    'inspector_protocol_files': [
-      'lib/Allocator_h.template',
-      'lib/Array_h.template',
-      'lib/CBOR_h.template',
-      'lib/CBOR_cpp.template',
-      'lib/DispatcherBase_cpp.template',
-      'lib/DispatcherBase_h.template',
-      'lib/ErrorSupport_cpp.template',
-      'lib/ErrorSupport_h.template',
-      'lib/Forward_h.template',
-      'lib/FrontendChannel_h.template',
-      'lib/Maybe_h.template',
-      'lib/Object_cpp.template',
-      'lib/Object_h.template',
-      'lib/Parser_cpp.template',
-      'lib/Parser_h.template',
-      'lib/Protocol_cpp.template',
-      'lib/ValueConversions_h.template',
-      'lib/Values_cpp.template',
-      'lib/Values_h.template',
-      'templates/Exported_h.template',
-      'templates/Imported_h.template',
-      'templates/TypeBuilder_cpp.template',
-      'templates/TypeBuilder_h.template',
-      'code_generator.py',
-    ]
-  }
-}
diff --git a/tools/v8_gypfiles/inspector.gypi b/tools/v8_gypfiles/inspector.gypi
deleted file mode 100644
index 79e582cea9e68d..00000000000000
--- a/tools/v8_gypfiles/inspector.gypi
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 2016 the V8 project authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
-  'includes': [
-    '../../deps/v8/third_party/inspector_protocol/inspector_protocol.gypi',
-  ],
-  'variables': {
-    'inspector_protocol_path': '<(V8_ROOT)/third_party/inspector_protocol',
-    'inspector_path': '<(V8_ROOT)/src/inspector',
-    'inspector_generated_output_root': '<(SHARED_INTERMEDIATE_DIR)/inspector-generated-output-root',
-    'inspector_generated_sources': [
-      '<(inspector_generated_output_root)/src/inspector/protocol/Forward.h',
-      '<(inspector_generated_output_root)/src/inspector/protocol/Protocol.cpp',
-      '<(inspector_generated_output_root)/src/inspector/protocol/Protocol.h',
-      '<(inspector_generated_output_root)/src/inspector/protocol/Console.cpp',
-      '<(inspector_generated_output_root)/src/inspector/protocol/Console.h',
-      '<(inspector_generated_output_root)/src/inspector/protocol/Debugger.cpp',
-      '<(inspector_generated_output_root)/src/inspector/protocol/Debugger.h',
-      '<(inspector_generated_output_root)/src/inspector/protocol/HeapProfiler.cpp',
-      '<(inspector_generated_output_root)/src/inspector/protocol/HeapProfiler.h',
-      '<(inspector_generated_output_root)/src/inspector/protocol/Profiler.cpp',
-      '<(inspector_generated_output_root)/src/inspector/protocol/Profiler.h',
-      '<(inspector_generated_output_root)/src/inspector/protocol/Runtime.cpp',
-      '<(inspector_generated_output_root)/src/inspector/protocol/Runtime.h',
-      '<(inspector_generated_output_root)/src/inspector/protocol/Schema.cpp',
-      '<(inspector_generated_output_root)/src/inspector/protocol/Schema.h',
-      '<(inspector_generated_output_root)/include/inspector/Debugger.h',
-      '<(inspector_generated_output_root)/include/inspector/Runtime.h',
-      '<(inspector_generated_output_root)/include/inspector/Schema.h',
-    ],
-
-    'inspector_all_sources': [
-      '<(V8_ROOT)/include/v8-inspector.h',
-      '<(V8_ROOT)/include/v8-inspector-protocol.h',
-      '<(V8_ROOT)/src/inspector/custom-preview.cc',
-      '<(V8_ROOT)/src/inspector/custom-preview.h',
-      '<(V8_ROOT)/src/inspector/injected-script.cc',
-      '<(V8_ROOT)/src/inspector/injected-script.h',
-      '<(V8_ROOT)/src/inspector/inspected-context.cc',
-      '<(V8_ROOT)/src/inspector/inspected-context.h',
-      '<(V8_ROOT)/src/inspector/remote-object-id.cc',
-      '<(V8_ROOT)/src/inspector/remote-object-id.h',
-      '<(V8_ROOT)/src/inspector/search-util.cc',
-      '<(V8_ROOT)/src/inspector/search-util.h',
-      '<(V8_ROOT)/src/inspector/string-16.cc',
-      '<(V8_ROOT)/src/inspector/string-16.h',
-      '<(V8_ROOT)/src/inspector/string-util.cc',
-      '<(V8_ROOT)/src/inspector/string-util.h',
-      '<(V8_ROOT)/src/inspector/test-interface.cc',
-      '<(V8_ROOT)/src/inspector/test-interface.h',
-      '<(V8_ROOT)/src/inspector/v8-console.cc',
-      '<(V8_ROOT)/src/inspector/v8-console.h',
-      '<(V8_ROOT)/src/inspector/v8-console-agent-impl.cc',
-      '<(V8_ROOT)/src/inspector/v8-console-agent-impl.h',
-      '<(V8_ROOT)/src/inspector/v8-console-message.cc',
-      '<(V8_ROOT)/src/inspector/v8-console-message.h',
-      '<(V8_ROOT)/src/inspector/v8-debugger.cc',
-      '<(V8_ROOT)/src/inspector/v8-debugger.h',
-      '<(V8_ROOT)/src/inspector/v8-debugger-agent-impl.cc',
-      '<(V8_ROOT)/src/inspector/v8-debugger-agent-impl.h',
-      '<(V8_ROOT)/src/inspector/v8-debugger-script.cc',
-      '<(V8_ROOT)/src/inspector/v8-debugger-script.h',
-      '<(V8_ROOT)/src/inspector/v8-heap-profiler-agent-impl.cc',
-      '<(V8_ROOT)/src/inspector/v8-heap-profiler-agent-impl.h',
-      '<(V8_ROOT)/src/inspector/v8-inspector-impl.cc',
-      '<(V8_ROOT)/src/inspector/v8-inspector-impl.h',
-      '<(V8_ROOT)/src/inspector/v8-inspector-session-impl.cc',
-      '<(V8_ROOT)/src/inspector/v8-inspector-session-impl.h',
-      '<(V8_ROOT)/src/inspector/v8-profiler-agent-impl.cc',
-      '<(V8_ROOT)/src/inspector/v8-profiler-agent-impl.h',
-      '<(V8_ROOT)/src/inspector/v8-regex.cc',
-      '<(V8_ROOT)/src/inspector/v8-regex.h',
-      '<(V8_ROOT)/src/inspector/v8-runtime-agent-impl.cc',
-      '<(V8_ROOT)/src/inspector/v8-runtime-agent-impl.h',
-      '<(V8_ROOT)/src/inspector/v8-schema-agent-impl.cc',
-      '<(V8_ROOT)/src/inspector/v8-schema-agent-impl.h',
-      '<(V8_ROOT)/src/inspector/v8-stack-trace-impl.cc',
-      '<(V8_ROOT)/src/inspector/v8-stack-trace-impl.h',
-      '<(V8_ROOT)/src/inspector/v8-value-utils.cc',
-      '<(V8_ROOT)/src/inspector/v8-value-utils.h',
-      '<(V8_ROOT)/src/inspector/value-mirror.cc',
-      '<(V8_ROOT)/src/inspector/value-mirror.h',
-      '<(V8_ROOT)/src/inspector/wasm-translation.cc',
-      '<(V8_ROOT)/src/inspector/wasm-translation.h',
-    ]
-  },
-  'include_dirs': [
-    '<(inspector_generated_output_root)',
-  ],
-  'actions': [
-    {
-      'action_name': 'protocol_compatibility',
-      'inputs': [
-        '<(inspector_path)/js_protocol.pdl',
-      ],
-      'outputs': [
-        '<@(inspector_generated_output_root)/src/js_protocol.stamp',
-      ],
-      'action': [
-        'python',
-        '<(inspector_protocol_path)/check_protocol_compatibility.py',
-        '--stamp', '<@(_outputs)',
-        '<@(_inputs)',
-      ],
-      'message': 'Checking inspector protocol compatibility',
-    },
-    {
-      'action_name': 'protocol_generated_sources',
-      'inputs': [
-        '<(inspector_path)/js_protocol.pdl',
-        '<(inspector_path)/inspector_protocol_config.json',
-        '<@(inspector_protocol_files)',
-      ],
-      'outputs': [
-        '<@(inspector_generated_sources)',
-      ],
-      'process_outputs_as_sources': 1,
-      'action': [
-        'python',
-        '<(inspector_protocol_path)/code_generator.py',
-        '--jinja_dir', '<(V8_ROOT)/third_party',
-        '--output_base', '<(inspector_generated_output_root)/src/inspector',
-        '--config', '<(inspector_path)/inspector_protocol_config.json',
-      ],
-      'message': 'Generating inspector protocol sources from protocol json',
-    },
-  ],
-}
diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
index 3ac28fc53f6046..f6d77466228a99 100644
--- a/tools/v8_gypfiles/v8.gyp
+++ b/tools/v8_gypfiles/v8.gyp
@@ -86,6 +86,7 @@
       "typed-array-subarray",
     ],
     'torque_output_root': '<(SHARED_INTERMEDIATE_DIR)/torque-output-root',
+    'torque_output_dir': '<(torque_output_root)/torque-generated',
     # Since there is no foreach in GYP we use `ForEachFormat` to unroll the following:
     # foreach(namespace, torque_namespaces) {
     #   outputs += [
@@ -93,14 +94,17 @@
     #     "$target_gen_dir/torque-generated/builtins-$namespace-from-dsl-gen.h",
     #   ]
     # }
-    'torque_outputs': [ '<!@pymod_do_main(ForEachFormat "<(torque_output_root)/torque-generated/builtins-%s-from-dsl-gen.cc" <@(torque_namespaces))' ],
-    'torque_outputs+': [ '<!@pymod_do_main(ForEachFormat "<(torque_output_root)/torque-generated/builtins-%s-from-dsl-gen.h" <@(torque_namespaces))' ],
+    'torque_outputs': [ '<!@pymod_do_main(ForEachFormat "<(torque_output_dir)/builtins-%s-from-dsl-gen.cc" <@(torque_namespaces))' ],
+    'torque_outputs+': [ '<!@pymod_do_main(ForEachFormat "<(torque_output_dir)/builtins-%s-from-dsl-gen.h" <@(torque_namespaces))' ],
     'torque_generated_pure_headers': [
-      '<(torque_output_root)/torque-generated/builtin-definitions-from-dsl.h',
-      '<(torque_output_root)/torque-generated/class-definitions-from-dsl.h',
+      '<(torque_output_dir)/builtin-definitions-from-dsl.h',
+      '<(torque_output_dir)/class-definitions-from-dsl.h',
     ],
   },
-  'includes': ['toolchain.gypi', 'features.gypi', 'v8_external_snapshot.gypi'],
+  'includes': [
+    'toolchain.gypi',
+    'features.gypi',
+  ],
   'targets': [
     {
       'target_name': 'v8',
@@ -550,7 +554,7 @@
           ],
         },
       ],
-    },  # generate_snapshot
+    }, # generate_snapshot
     {
       'target_name': 'v8_nosnapshot',
       'type': 'static_library',
@@ -588,12 +592,11 @@
       # Since this target is a static-library, but as a side effect it generates
       # header files, it needs to be a hard dependency.
       'hard_dependency': 1,
-      'includes': [ 'inspector.gypi' ],
       'dependencies': [
         'v8_libbase',
         'v8_libsampler',
         # Code generators that only need to be build for the host.
-        'torque#host',
+        'generate-code#host',
         'generate_bytecode_builtins_list#host',
       ],
       'include_dirs': [
@@ -607,8 +610,6 @@
         ],
       },
       'sources': [
-        '<(V8_ROOT)/include/v8-inspector-protocol.h',
-        '<(V8_ROOT)/include/v8-inspector.h',
         '<(V8_ROOT)/include/v8-internal.h',
         '<(V8_ROOT)/include/v8-platform.h',
         '<(V8_ROOT)/include/v8-profiler.h',
@@ -1779,7 +1780,6 @@
         '<(V8_ROOT)/src/zone/zone.h',
         '<(generate_bytecode_builtins_list_output)',
         '<@(torque_generated_pure_headers)',
-        '<@(inspector_all_sources)',
       ],
       'conditions': [
         ['want_separate_host_toolset==1', {
@@ -2137,21 +2137,6 @@
         }],
       ],
       'actions': [
-        {
-          'action_name': 'run_torque_action',
-          'inputs': [  # Order matters.
-            '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)',
-            '<@(torque_files)',
-          ],
-          'outputs': [
-            '<@(torque_outputs)',
-            '<@(torque_generated_pure_headers)',
-          ],
-          'action': [
-            '<@(_inputs)',
-            '-o', '<(torque_output_root)/torque-generated'
-          ],
-        },
       ],
     }, # v8_base
     {
@@ -2732,5 +2717,171 @@
         },
       ],
     }, # generate_bytecode_builtins_list
+    {
+      'target_name': 'generate-code',
+      'type': 'none',
+      'toolsets': [ 'host' ],
+      'dependencies': [
+        # Code generators that only need to be build for the host.
+        'torque#host',
+      ],
+
+      'variables': {
+        'inspector_protocol_path': '<(V8_ROOT)/third_party/inspector_protocol',
+        'v8_inspector_src_dir': '<(V8_ROOT)/src/inspector',
+        # This list comes from deps/v8/third_party/inspector_protocol/inspector_protocol.gni
+        'inspector_protocol_templates': [
+          '<(inspector_protocol_path)/lib/base_string_adapter_cc.template',
+          '<(inspector_protocol_path)/lib/base_string_adapter_h.template',
+          '<(inspector_protocol_path)/lib/Allocator_h.template',
+          '<(inspector_protocol_path)/lib/Array_h.template',
+          '<(inspector_protocol_path)/lib/CBOR_h.template',
+          '<(inspector_protocol_path)/lib/CBOR_cpp.template',
+          '<(inspector_protocol_path)/lib/DispatcherBase_cpp.template',
+          '<(inspector_protocol_path)/lib/DispatcherBase_h.template',
+          '<(inspector_protocol_path)/lib/ErrorSupport_cpp.template',
+          '<(inspector_protocol_path)/lib/ErrorSupport_h.template',
+          '<(inspector_protocol_path)/lib/Forward_h.template',
+          '<(inspector_protocol_path)/lib/FrontendChannel_h.template',
+          '<(inspector_protocol_path)/lib/Maybe_h.template',
+          '<(inspector_protocol_path)/lib/Object_cpp.template',
+          '<(inspector_protocol_path)/lib/Object_h.template',
+          '<(inspector_protocol_path)/lib/Parser_cpp.template',
+          '<(inspector_protocol_path)/lib/Parser_h.template',
+          '<(inspector_protocol_path)/lib/Protocol_cpp.template',
+          '<(inspector_protocol_path)/lib/ValueConversions_h.template',
+          '<(inspector_protocol_path)/lib/Values_cpp.template',
+          '<(inspector_protocol_path)/lib/Values_h.template',
+          '<(inspector_protocol_path)/templates/Exported_h.template',
+          '<(inspector_protocol_path)/templates/Imported_h.template',
+          '<(inspector_protocol_path)/templates/TypeBuilder_cpp.template',
+          '<(inspector_protocol_path)/templates/TypeBuilder_h.template',
+        ],
+        'inspector_generated_output_root': '<(SHARED_INTERMEDIATE_DIR)/inspector-generated-output-root',
+        'inspector_generated_output_dir': '<(inspector_generated_output_root)/src/inspector',
+        'inspector_generated_output_dir_include': '<(inspector_generated_output_root)/include/',
+        # This list comes from deps/v8/src/inspector/BUILD.gn
+        'inspector_generated_sources': [
+          '<(inspector_generated_output_dir)/protocol/Forward.h',
+          '<(inspector_generated_output_dir)/protocol/Protocol.cpp',
+          '<(inspector_generated_output_dir)/protocol/Protocol.h',
+          '<(inspector_generated_output_dir)/protocol/Console.cpp',
+          '<(inspector_generated_output_dir)/protocol/Console.h',
+          '<(inspector_generated_output_dir)/protocol/Debugger.cpp',
+          '<(inspector_generated_output_dir)/protocol/Debugger.h',
+          '<(inspector_generated_output_dir)/protocol/HeapProfiler.cpp',
+          '<(inspector_generated_output_dir)/protocol/HeapProfiler.h',
+          '<(inspector_generated_output_dir)/protocol/Profiler.cpp',
+          '<(inspector_generated_output_dir)/protocol/Profiler.h',
+          '<(inspector_generated_output_dir)/protocol/Runtime.cpp',
+          '<(inspector_generated_output_dir)/protocol/Runtime.h',
+          '<(inspector_generated_output_dir)/protocol/Schema.cpp',
+          '<(inspector_generated_output_dir)/protocol/Schema.h',
+          '<(inspector_generated_output_dir_include)/inspector/Debugger.h',
+          '<(inspector_generated_output_dir_include)/inspector/Runtime.h',
+          '<(inspector_generated_output_dir_include)/inspector/Schema.h',
+        ],
+        'inspector_all_sources': [
+          '<(V8_ROOT)/include/v8-inspector.h',
+          '<(V8_ROOT)/include/v8-inspector-protocol.h',
+          '<(V8_ROOT)/src/inspector/custom-preview.cc',
+          '<(V8_ROOT)/src/inspector/custom-preview.h',
+          '<(V8_ROOT)/src/inspector/injected-script.cc',
+          '<(V8_ROOT)/src/inspector/injected-script.h',
+          '<(V8_ROOT)/src/inspector/inspected-context.cc',
+          '<(V8_ROOT)/src/inspector/inspected-context.h',
+          '<(V8_ROOT)/src/inspector/remote-object-id.cc',
+          '<(V8_ROOT)/src/inspector/remote-object-id.h',
+          '<(V8_ROOT)/src/inspector/search-util.cc',
+          '<(V8_ROOT)/src/inspector/search-util.h',
+          '<(V8_ROOT)/src/inspector/string-16.cc',
+          '<(V8_ROOT)/src/inspector/string-16.h',
+          '<(V8_ROOT)/src/inspector/string-util.cc',
+          '<(V8_ROOT)/src/inspector/string-util.h',
+          '<(V8_ROOT)/src/inspector/test-interface.cc',
+          '<(V8_ROOT)/src/inspector/test-interface.h',
+          '<(V8_ROOT)/src/inspector/v8-console.cc',
+          '<(V8_ROOT)/src/inspector/v8-console.h',
+          '<(V8_ROOT)/src/inspector/v8-console-agent-impl.cc',
+          '<(V8_ROOT)/src/inspector/v8-console-agent-impl.h',
+          '<(V8_ROOT)/src/inspector/v8-console-message.cc',
+          '<(V8_ROOT)/src/inspector/v8-console-message.h',
+          '<(V8_ROOT)/src/inspector/v8-debugger.cc',
+          '<(V8_ROOT)/src/inspector/v8-debugger.h',
+          '<(V8_ROOT)/src/inspector/v8-debugger-agent-impl.cc',
+          '<(V8_ROOT)/src/inspector/v8-debugger-agent-impl.h',
+          '<(V8_ROOT)/src/inspector/v8-debugger-script.cc',
+          '<(V8_ROOT)/src/inspector/v8-debugger-script.h',
+          '<(V8_ROOT)/src/inspector/v8-heap-profiler-agent-impl.cc',
+          '<(V8_ROOT)/src/inspector/v8-heap-profiler-agent-impl.h',
+          '<(V8_ROOT)/src/inspector/v8-inspector-impl.cc',
+          '<(V8_ROOT)/src/inspector/v8-inspector-impl.h',
+          '<(V8_ROOT)/src/inspector/v8-inspector-session-impl.cc',
+          '<(V8_ROOT)/src/inspector/v8-inspector-session-impl.h',
+          '<(V8_ROOT)/src/inspector/v8-profiler-agent-impl.cc',
+          '<(V8_ROOT)/src/inspector/v8-profiler-agent-impl.h',
+          '<(V8_ROOT)/src/inspector/v8-regex.cc',
+          '<(V8_ROOT)/src/inspector/v8-regex.h',
+          '<(V8_ROOT)/src/inspector/v8-runtime-agent-impl.cc',
+          '<(V8_ROOT)/src/inspector/v8-runtime-agent-impl.h',
+          '<(V8_ROOT)/src/inspector/v8-schema-agent-impl.cc',
+          '<(V8_ROOT)/src/inspector/v8-schema-agent-impl.h',
+          '<(V8_ROOT)/src/inspector/v8-stack-trace-impl.cc',
+          '<(V8_ROOT)/src/inspector/v8-stack-trace-impl.h',
+          '<(V8_ROOT)/src/inspector/v8-value-utils.cc',
+          '<(V8_ROOT)/src/inspector/v8-value-utils.h',
+          '<(V8_ROOT)/src/inspector/value-mirror.cc',
+          '<(V8_ROOT)/src/inspector/value-mirror.h',
+          '<(V8_ROOT)/src/inspector/wasm-translation.cc',
+          '<(V8_ROOT)/src/inspector/wasm-translation.h',
+        ]
+      },
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '<(inspector_generated_output_root)',
+        ],
+        'sources': [
+          '<@(inspector_all_sources)',
+          '<@(inspector_generated_sources)',
+        ],
+      },
+      'actions': [
+        {
+          'action_name': 'generate_inspector_protocol_code',
+          'message': 'Generating inspector protocol sources',
+          'inputs': [
+            '<(inspector_protocol_path)/code_generator.py',
+            '<(v8_inspector_src_dir)/inspector_protocol_config.json',
+            '<@(inspector_protocol_templates)',
+          ],
+          'outputs': [
+            '<@(inspector_generated_sources)',
+          ],
+          'action': [
+            'python', '<(inspector_protocol_path)/code_generator.py',
+            '--config', '<(v8_inspector_src_dir)/inspector_protocol_config.json',
+            '--jinja_dir', '<(V8_ROOT)/third_party',
+            '--output_base', '<(inspector_generated_output_dir)',
+          ],
+        },
+        {
+          'action_name': 'run_torque_action',
+          'message': 'Running torque',
+          'inputs': [
+            # Order matters, since this list is used as arguments for invoking the action
+            '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)',
+            '<@(torque_files)',
+          ],
+          'outputs': [
+            '<@(torque_outputs)',
+            '<@(torque_generated_pure_headers)',
+          ],
+          'action': [
+            '<@(_inputs)',
+            '-o', '<(torque_output_dir)',
+          ],
+        },
+      ],
+    }, # generate-code
   ],
 }