From cab1c91c3e46b32fcad3b54844a8336a51d4c925 Mon Sep 17 00:00:00 2001
From: Liviu Rau <liviurau@google.com>
Date: Thu, 20 Jan 2022 11:29:27 +0100
Subject: [PATCH] Consolidate arguments that change together on branch cut

Bug: v8:12405
Change-Id: I00f727ad5172d08f430b5dc2b7a348cbec344c4a
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3401721
Reviewed-by: Lutz Vahl <vahl@chromium.org>
Reviewed-by: Camillo Bruni <cbruni@chromium.org>
Commit-Queue: Liviu Rau <liviurau@chromium.org>
Cr-Commit-Position: refs/heads/main@{#78696}
---
 BUILD.gn                         | 2 +-
 gni/OWNERS                       | 2 ++
 gni/release_branch_toggle.gni    | 7 +++++++
 gni/v8.gni                       | 3 ++-
 src/logging/runtime-call-stats.h | 2 ++
 5 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 gni/release_branch_toggle.gni

diff --git a/BUILD.gn b/BUILD.gn
index fb7fc4e909..32011265ef 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -83,7 +83,7 @@ declare_args() {
   v8_enable_hugepage = false
 
   # Sets -dENABLE_HANDLE_ZAPPING.
-  v8_enable_handle_zapping = true
+  v8_enable_handle_zapping = !is_on_release_branch || is_debug
 
   # Enable slow dchecks.
   v8_enable_slow_dchecks = false
diff --git a/gni/OWNERS b/gni/OWNERS
index cb04fa0838..c417ffe79f 100644
--- a/gni/OWNERS
+++ b/gni/OWNERS
@@ -1 +1,3 @@
 file:../INFRA_OWNERS
+
+per-file release_branch_toggle.gni=v8-ci-autoroll-builder@chops-service-accounts.iam.gserviceaccount.com
\ No newline at end of file
diff --git a/gni/release_branch_toggle.gni b/gni/release_branch_toggle.gni
new file mode 100644
index 0000000000..cfbf28dc52
--- /dev/null
+++ b/gni/release_branch_toggle.gni
@@ -0,0 +1,7 @@
+# Copyright 2022 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.
+
+declare_args() {
+  is_on_release_branch = false
+}
\ No newline at end of file
diff --git a/gni/v8.gni b/gni/v8.gni
index fe445307f9..fb05e029ec 100644
--- a/gni/v8.gni
+++ b/gni/v8.gni
@@ -6,6 +6,7 @@ import("//build/config/gclient_args.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/v8_target_cpu.gni")
 import("split_static_library.gni")
+import("release_branch_toggle.gni")
 
 declare_args() {
   # Set flags for tracking code coverage. Uses gcov with gcc and sanitizer
@@ -73,7 +74,7 @@ declare_args() {
   v8_enable_webassembly = ""
 
   # Enable runtime call stats.
-  v8_enable_runtime_call_stats = true
+  v8_enable_runtime_call_stats = !is_on_release_branch
 
   # Add fuzzilli fuzzer support.
   v8_fuzzilli = false
diff --git a/src/logging/runtime-call-stats.h b/src/logging/runtime-call-stats.h
index 0c4425730c..3453faa114 100644
--- a/src/logging/runtime-call-stats.h
+++ b/src/logging/runtime-call-stats.h
@@ -5,6 +5,8 @@
 #ifndef V8_LOGGING_RUNTIME_CALL_STATS_H_
 #define V8_LOGGING_RUNTIME_CALL_STATS_H_
 
+#include "src/base/macros.h"
+
 #ifdef V8_RUNTIME_CALL_STATS
 
 #include "src/base/atomic-utils.h"