From fc6754360bea168b5a3ebff194f47d3525d3fc2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= <targos@protonmail.com>
Date: Tue, 27 Aug 2024 10:40:54 +0200
Subject: [PATCH] deps: patch V8 to support older Clang versions

PR-URL: https://github.com/nodejs/node/pull/54536
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
---
 common.gypi                                     |  2 +-
 .../src/base/template-meta-programming/list.h   | 12 ++++++------
 deps/v8/src/compiler/turboshaft/assembler.h     | 17 +++++++++--------
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/common.gypi b/common.gypi
index 74c4b120c11..af2f3d9cb1a 100644
--- a/common.gypi
+++ b/common.gypi
@@ -36,7 +36,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.6',
+    'v8_embedder_string': '-node.7',
 
     ##### V8 defaults for Node.js #####
 
diff --git a/deps/v8/src/base/template-meta-programming/list.h b/deps/v8/src/base/template-meta-programming/list.h
index fdf9fac08e6..bdf1d5c9a5b 100644
--- a/deps/v8/src/base/template-meta-programming/list.h
+++ b/deps/v8/src/base/template-meta-programming/list.h
@@ -133,7 +133,7 @@ template <template <typename, typename> typename F, typename T, typename Head,
           typename... Tail>
 struct fold_right_impl<F, T, list<Head, Tail...>> {
   using type =
-      F<Head, typename fold_right_impl<F, T, list<Tail...>>::type>::type;
+      typename F<Head, typename fold_right_impl<F, T, list<Tail...>>::type>::type;
 };
 template <template <typename, typename> typename F, typename T>
 struct fold_right_impl<F, T, list<>> {
@@ -146,7 +146,7 @@ template <template <TYPENAME1, typename> typename F, typename T, TYPENAME1 Head,
           TYPENAME1... Tail>
 struct fold_right1_impl<F, T, list1<Head, Tail...>> {
   using type =
-      F<Head, typename fold_right1_impl<F, T, list1<Tail...>>::type>::type;
+      typename F<Head, typename fold_right1_impl<F, T, list1<Tail...>>::type>::type;
 };
 template <template <TYPENAME1, typename> typename F, typename T>
 struct fold_right1_impl<F, T, list1<>> {
@@ -216,11 +216,11 @@ constexpr bool all_equal_v = all_equal<List, Cmp>::value;
 template <typename List, size_t I, typename T>
 struct insert_at : public detail::insert_at_impl<I, T, list<>, List> {};
 template <typename List, size_t I, typename T>
-using insert_at_t = insert_at<List, I, T>::type;
+using insert_at_t = typename insert_at<List, I, T>::type;
 template <typename List1, size_t I, TYPENAME1 T>
 struct insert_at1 : public detail::insert_at1_impl<I, T, list1<>, List1> {};
 template <typename List1, size_t I, TYPENAME1 T>
-using insert_at1_t = insert_at1<List1, I, T>::type;
+using insert_at1_t = typename insert_at1<List1, I, T>::type;
 
 // fold_right recursively applies binary function {F} to elements of the {List}
 // and the previous result, starting from the right. The initial value is {T}.
@@ -231,11 +231,11 @@ using insert_at1_t = insert_at1<List1, I, T>::type;
 template <template <typename, typename> typename F, typename List, typename T>
 struct fold_right : public detail::fold_right_impl<F, T, List> {};
 template <template <typename, typename> typename F, typename List, typename T>
-using fold_right_t = fold_right<F, List, T>::type;
+using fold_right_t = typename fold_right<F, List, T>::type;
 template <template <TYPENAME1, typename> typename F, typename List1, typename T>
 struct fold_right1 : public detail::fold_right1_impl<F, T, List1> {};
 template <template <TYPENAME1, typename> typename F, typename List1, typename T>
-using fold_right1_t = fold_right1<F, List1, T>::type;
+using fold_right1_t = typename fold_right1<F, List1, T>::type;
 
 }  // namespace v8::base::tmp
 
diff --git a/deps/v8/src/compiler/turboshaft/assembler.h b/deps/v8/src/compiler/turboshaft/assembler.h
index 0d46eb24d1a..95b80d48103 100644
--- a/deps/v8/src/compiler/turboshaft/assembler.h
+++ b/deps/v8/src/compiler/turboshaft/assembler.h
@@ -5,6 +5,7 @@
 #ifndef V8_COMPILER_TURBOSHAFT_ASSEMBLER_H_
 #define V8_COMPILER_TURBOSHAFT_ASSEMBLER_H_
 
+#include <concepts>
 #include <cstring>
 #include <iomanip>
 #include <iterator>
@@ -193,8 +194,8 @@ template <typename T>
 class IndexRange : public Range<T> {
  public:
   using base = Range<T>;
-  using value_type = base::value_type;
-  using iterator_type = base::iterator_type;
+  using value_type = typename base::value_type;
+  using iterator_type = typename base::iterator_type;
 
   explicit IndexRange(ConstOrV<T> count) : Range<T>(0, count, 1) {}
 };
@@ -222,8 +223,8 @@ class Sequence : private Range<T> {
   using base = Range<T>;
 
  public:
-  using value_type = base::value_type;
-  using iterator_type = base::iterator_type;
+  using value_type = typename base::value_type;
+  using iterator_type = typename base::iterator_type;
 
   explicit Sequence(ConstOrV<T> begin, ConstOrV<T> stride = 1)
       : base(begin, 0, stride) {}
@@ -727,7 +728,7 @@ struct LoopLabelForHelper<std::tuple<V<Ts>...>> {
 }  // namespace detail
 
 template <typename T>
-using LoopLabelFor = detail::LoopLabelForHelper<T>::type;
+using LoopLabelFor = typename detail::LoopLabelForHelper<T>::type;
 
 Handle<Code> BuiltinCodeHandle(Builtin builtin, Isolate* isolate);
 
@@ -786,19 +787,19 @@ struct ReducerStack {
   static_assert(base_index == length - 1);
   // Insert a GenericReducerBase before that.
   using WithGeneric =
-      reducer_list_insert_at<ReducerList, base_index, GenericReducerBase>::type;
+      typename reducer_list_insert_at<ReducerList, base_index, GenericReducerBase>::type;
   // If we have a ValueNumberingReducer in the list, we insert at that index,
   // otherwise before the reducer_base.
   static constexpr size_t ep_index =
       reducer_list_index_of<WithGeneric, ValueNumberingReducer,
                             base_index>::value;
   using WithGenericAndEmitProjection =
-      reducer_list_insert_at<WithGeneric, ep_index,
+      typename reducer_list_insert_at<WithGeneric, ep_index,
                              EmitProjectionReducer>::type;
   static_assert(reducer_list_length<WithGenericAndEmitProjection>::value ==
                 length + 2);
 
-  using type = reducer_list_to_stack<WithGenericAndEmitProjection,
+  using type = typename reducer_list_to_stack<WithGenericAndEmitProjection,
                                      StackBottom<ReducerList>>::type;
 };