Skip to content

Commit 1c13fee

Browse files
committed
deps: patch V8 to support older Clang versions
PR-URL: nodejs#54536 Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: Marco Ippolito <[email protected]> Reviewed-By: Richard Lau <[email protected]>
1 parent 1660390 commit 1c13fee

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

common.gypi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
# Reset this number to 0 on major V8 upgrades.
3838
# Increment by one for each non-official patch applied to deps/v8.
39-
'v8_embedder_string': '-node.6',
39+
'v8_embedder_string': '-node.7',
4040

4141
##### V8 defaults for Node.js #####
4242

deps/v8/include/v8-internal.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1430,7 +1430,7 @@ struct MaybeDefineIteratorConcept {};
14301430
template <typename Iterator>
14311431
struct MaybeDefineIteratorConcept<
14321432
Iterator, std::enable_if_t<kHaveIteratorConcept<Iterator>>> {
1433-
using iterator_concept = Iterator::iterator_concept;
1433+
using iterator_concept = typename Iterator::iterator_concept;
14341434
};
14351435
// Otherwise fall back to `std::iterator_traits<Iterator>` if possible.
14361436
template <typename Iterator>
@@ -1443,7 +1443,7 @@ struct MaybeDefineIteratorConcept<
14431443
// TODO(pkasting): Add this unconditionally after dropping support for old
14441444
// libstdc++ versions.
14451445
#if __has_include(<ranges>)
1446-
using iterator_concept = std::iterator_traits<Iterator>::iterator_concept;
1446+
using iterator_concept = typename std::iterator_traits<Iterator>::iterator_concept;
14471447
#endif
14481448
};
14491449

deps/v8/src/compiler/turboshaft/assembler.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#ifndef V8_COMPILER_TURBOSHAFT_ASSEMBLER_H_
66
#define V8_COMPILER_TURBOSHAFT_ASSEMBLER_H_
77

8+
#include <concepts>
89
#include <cstring>
910
#include <iomanip>
1011
#include <iterator>
@@ -197,8 +198,8 @@ template <typename T>
197198
class IndexRange : public Range<T> {
198199
public:
199200
using base = Range<T>;
200-
using value_type = base::value_type;
201-
using iterator_type = base::iterator_type;
201+
using value_type = typename base::value_type;
202+
using iterator_type = typename base::iterator_type;
202203

203204
explicit IndexRange(ConstOrV<T> count) : Range<T>(0, count, 1) {}
204205
};
@@ -226,8 +227,8 @@ class Sequence : private Range<T> {
226227
using base = Range<T>;
227228

228229
public:
229-
using value_type = base::value_type;
230-
using iterator_type = base::iterator_type;
230+
using value_type = typename base::value_type;
231+
using iterator_type = typename base::iterator_type;
231232

232233
explicit Sequence(ConstOrV<T> begin, ConstOrV<T> stride = 1)
233234
: base(begin, 0, stride) {}
@@ -731,7 +732,7 @@ struct LoopLabelForHelper<std::tuple<V<Ts>...>> {
731732
} // namespace detail
732733

733734
template <typename T>
734-
using LoopLabelFor = detail::LoopLabelForHelper<T>::type;
735+
using LoopLabelFor = typename detail::LoopLabelForHelper<T>::type;
735736

736737
Handle<Code> BuiltinCodeHandle(Builtin builtin, Isolate* isolate);
737738

0 commit comments

Comments
 (0)