From 5fe74aa4035047c926be305d499b148c9569e85f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= <targos@protonmail.com>
Date: Sun, 11 Apr 2021 08:16:48 +0200
Subject: [PATCH] tools: update V8 gypfiles for 9.2

Backport-PR-URL: https://github.com/nodejs/node/pull/39470
PR-URL: https://github.com/nodejs/node/pull/38990
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Robert Nagy <ronagy@icloud.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
---
 tools/v8_gypfiles/features.gypi | 16 +++++-----
 tools/v8_gypfiles/v8.gyp        | 56 ++++++++++++++++++++++++---------
 2 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/tools/v8_gypfiles/features.gypi b/tools/v8_gypfiles/features.gypi
index 97676305cffbc5..68da6ef3378904 100644
--- a/tools/v8_gypfiles/features.gypi
+++ b/tools/v8_gypfiles/features.gypi
@@ -62,6 +62,12 @@
       }, {
         'is_component_build': 0,
       }],
+      ['OS == "win" or OS == "mac"', {
+        # Sets -DSYSTEM_INSTRUMENTATION. Enables OS-dependent event tracing
+        'v8_enable_system_instrumentation': 1,
+      }, {
+        'v8_enable_system_instrumentation': 0,
+      }],
     ],
     'is_debug%': 0,
 
@@ -160,10 +166,6 @@
     # Controls the threshold for on-heap/off-heap Typed Arrays.
     'v8_typed_array_max_size_in_heap%': 64,
 
-    # Temporary flag to allow embedders to update their microtasks scopes
-    # while rolling in a new version of V8.
-    'v8_check_microtasks_scopes_consistency%': 0,
-
     # Enable mitigations for executing untrusted code.
     'v8_untrusted_code_mitigations%': 1,
 
@@ -327,9 +329,6 @@
       ['v8_enable_lazy_source_positions==1', {
         'defines': ['V8_ENABLE_LAZY_SOURCE_POSITIONS',],
       }],
-      ['v8_check_microtasks_scopes_consistency==1', {
-        'defines': ['V8_CHECK_MICROTASKS_SCOPES_CONSISTENCY',],
-      }],
       ['v8_use_siphash==1', {
         'defines': ['V8_USE_SIPHASH',],
       }],
@@ -360,6 +359,9 @@
       ['v8_enable_precise_zone_stats==1', {
         'defines': ['V8_ENABLE_PRECISE_ZONE_STATS',],
       }],
+      ['v8_enable_system_instrumentation==1', {
+        'defines': ['V8_ENABLE_SYSTEM_INSTRUMENTATION',],
+      }],
       ['v8_enable_webassembly==1', {
         'defines': ['V8_ENABLE_WEBASSEMBLY',],
       }],
diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
index 3853a007b37bb1..18945be9313b6f 100644
--- a/tools/v8_gypfiles/v8.gyp
+++ b/tools/v8_gypfiles/v8.gyp
@@ -671,6 +671,11 @@
               '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn"  "\\"v8_internal_headers.*?v8_current_cpu == \\"s390\\".*?sources \\+= ")',
             ],
           }],
+          ['v8_target_arch=="riscv64"', {
+            'sources': [
+              '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn"  "\\"v8_internal_headers.*?v8_current_cpu == \\"riscv64\\".*?sources \\+= ")',
+            ],
+          }],
         ],
       },
     },  # v8_internal_headers
@@ -856,11 +861,6 @@
             '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn"  "\\"v8_base_without_compiler.*?v8_current_cpu == \\"mips\\".*?sources \\+= ")',
           ],
         }],
-        ['v8_target_arch=="riscv64"', {
-          'sources': [  ### gcmole(arch:riscv64) ###
-            '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn"  "\\"v8_base_without_compiler.*?v8_current_cpu == \\"riscv64.*?sources \+= ")',
-          ],
-        }],        
         ['v8_target_arch=="mips64" or v8_target_arch=="mips64el"', {
           'sources': [
             '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn"  "\\"v8_base_without_compiler.*?v8_current_cpu == \\"mips64\\".*?sources \\+= ")',
@@ -881,6 +881,11 @@
             '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn"  "\\"v8_base_without_compiler.*?v8_current_cpu == \\"s390\\".*?sources \\+= ")',
           ],
         }],
+        ['v8_target_arch=="riscv64"', {
+          'sources': [
+            '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn"  "\\"v8_base_without_compiler.*?v8_current_cpu == \\"riscv64\\".*?sources \\+= ")',
+          ],
+        }],        
         ['OS=="win"', {
           'msvs_precompiled_header': '<(V8_ROOT)/../../tools/msvs/pch/v8_pch.h',
           'msvs_precompiled_source': '<(V8_ROOT)/../../tools/msvs/pch/v8_pch.cc',
@@ -895,6 +900,13 @@
               'ObjectFile': '$(IntDir)%(Extension)\\',
             },
           },
+          'conditions': [
+            ['v8_enable_system_instrumentation==1', {
+              'sources': [
+                '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn"  "\\"v8_base_without_compiler.*?is_win.*?v8_enable_system_instrumentation.*?sources \\+= ")',
+              ],
+            }],
+          ],
         }],
         ['component=="shared_library"', {
           'defines': [
@@ -1133,9 +1145,11 @@
             '<(V8_ROOT)/src/base/platform/platform-win32.cc',
             '<(V8_ROOT)/src/base/win32-headers.h',
           ],
-          'conditions': [['target_arch == "arm64"', {
-            'defines': ['_WIN32_WINNT=0x0602'], # For GetCurrentThreadStackLimits on Windows on Arm
-          }]],
+          'conditions': [
+            ['target_arch == "arm64"', {
+              'defines': ['_WIN32_WINNT=0x0602'], # For GetCurrentThreadStackLimits on Windows on Arm
+            }],
+          ],
           'defines': ['_CRT_RAND_S'], # for rand_s()
           'direct_dependent_settings': {
             'msvs_settings': {
@@ -1147,6 +1161,17 @@
                 ]
               }
             },
+            'conditions': [
+              ['v8_enable_system_instrumentation==1', {
+                'msvs_settings': {
+                  'VCLinkerTool': {
+                    'AdditionalDependencies': [
+                      'advapi32.lib',
+                    ],
+                  },
+                },
+              }],
+            ],
           },
         }],
         ['target_arch == "mips" or OS == "mips64"', {
@@ -1288,8 +1313,6 @@
         '<(V8_ROOT)/src/libplatform/delayed-task-queue.h',
         '<(V8_ROOT)/src/libplatform/task-queue.cc',
         '<(V8_ROOT)/src/libplatform/task-queue.h',
-        '<(V8_ROOT)/src/libplatform/tracing/recorder-default.cc',
-        '<(V8_ROOT)/src/libplatform/tracing/recorder.h',
         '<(V8_ROOT)/src/libplatform/tracing/trace-buffer.cc',
         '<(V8_ROOT)/src/libplatform/tracing/trace-buffer.h',
         '<(V8_ROOT)/src/libplatform/tracing/trace-config.cc',
@@ -1313,7 +1336,6 @@
         ['v8_use_perfetto==1', {
           'sources!': [
             '<(V8_ROOT)/base/trace_event/common/trace_event_common.h',
-            '<(V8_ROOT)/src/libplatform/tracing/recorder-default.cc',
             '<(V8_ROOT)/src/libplatform/tracing/trace-buffer.cc',
             '<(V8_ROOT)/src/libplatform/tracing/trace-buffer.h',
             '<(V8_ROOT)/src/libplatform/tracing/trace-object.cc',
@@ -1329,14 +1351,18 @@
             '<(V8_ROOT)/third_party/perfetto/protos/perfetto/trace:lite',
           ],
         }],
-        ['v8_use_perfetto==0 and is_win', {
-          'sources!': [
-            '<(V8_ROOT)/src/libplatform/tracing/recorder-default.cc',
-          ],
+        ['v8_enable_system_instrumentation==1 and is_win', {
           'sources': [
+            '<(V8_ROOT)/src/libplatform/tracing/recorder.h',
             '<(V8_ROOT)/src/libplatform/tracing/recorder-win.cc',
           ],
         }],
+        ['v8_enable_system_instrumentation==1 and OS=="mac"', {
+          'sources': [
+            '<(V8_ROOT)/src/libplatform/tracing/recorder.h',
+            '<(V8_ROOT)/src/libplatform/tracing/recorder-mac.cc',
+          ],
+        }],
       ],
       'direct_dependent_settings': {
         'include_dirs': [