Skip to content

Commit

Permalink
deps: patch V8 to support older Clang versions
Browse files Browse the repository at this point in the history
PR-URL: nodejs#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>
  • Loading branch information
targos committed Jan 3, 2025
1 parent 1660390 commit 1c13fee
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -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 #####

Expand Down
4 changes: 2 additions & 2 deletions deps/v8/include/v8-internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -1430,7 +1430,7 @@ struct MaybeDefineIteratorConcept {};
template <typename Iterator>
struct MaybeDefineIteratorConcept<
Iterator, std::enable_if_t<kHaveIteratorConcept<Iterator>>> {
using iterator_concept = Iterator::iterator_concept;
using iterator_concept = typename Iterator::iterator_concept;
};
// Otherwise fall back to `std::iterator_traits<Iterator>` if possible.
template <typename Iterator>
Expand All @@ -1443,7 +1443,7 @@ struct MaybeDefineIteratorConcept<
// TODO(pkasting): Add this unconditionally after dropping support for old
// libstdc++ versions.
#if __has_include(<ranges>)
using iterator_concept = std::iterator_traits<Iterator>::iterator_concept;
using iterator_concept = typename std::iterator_traits<Iterator>::iterator_concept;
#endif
};

Expand Down
11 changes: 6 additions & 5 deletions deps/v8/src/compiler/turboshaft/assembler.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#ifndef V8_COMPILER_TURBOSHAFT_ASSEMBLER_H_
#define V8_COMPILER_TURBOSHAFT_ASSEMBLER_H_

#include <concepts>
#include <cstring>
#include <iomanip>
#include <iterator>
Expand Down Expand Up @@ -197,8 +198,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) {}
};
Expand Down Expand Up @@ -226,8 +227,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) {}
Expand Down Expand Up @@ -731,7 +732,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);

Expand Down

0 comments on commit 1c13fee

Please sign in to comment.