Skip to content

Commit c3bc66a

Browse files
committed
v8: update v8 patch to avoid breaking building with clang
1 parent 9efc84a commit c3bc66a

2 files changed

Lines changed: 11 additions & 1 deletion

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3934,7 +3934,7 @@ class TSAssembler
39343934
: public Assembler<reducer_list<TurboshaftAssemblerOpInterface, Reducers...,
39353935
TSReducerBase>> {
39363936
public:
3937-
#ifdef _WIN32
3937+
#if defined(_MSC_VER) && !defined(__clang__)
39383938
explicit TSAssembler(Graph& input_graph, Graph& output_graph,
39393939
Zone* phase_zone)
39403940
: Assembler(input_graph, output_graph, phase_zone) {}

deps/v8/src/compiler/turboshaft/copying-phase.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,12 @@ class GraphVisitor : public Next {
193193
DCHECK(old_index.valid());
194194
OpIndex result = op_mapping_[old_index];
195195

196+
#if defined(_MSC_VER) && !defined(__clang__)
196197
if (contains_variable_reducer_) {
198+
#else
199+
if constexpr (reducer_list_contains<typename Next::ReducerList,
200+
VariableReducer>::value) {
201+
#endif
197202
if (!result.valid()) {
198203
// {op_mapping} doesn't have a mapping for {old_index}. The assembler
199204
// should provide the mapping.
@@ -1309,7 +1314,12 @@ class GraphVisitor : public Next {
13091314
DCHECK(Asm().input_graph().BelongsToThisGraph(old_index));
13101315
DCHECK_IMPLIES(new_index.valid(),
13111316
Asm().output_graph().BelongsToThisGraph(new_index));
1317+
#if defined(_MSC_VER) && !defined(__clang__)
13121318
if (contains_variable_reducer_) {
1319+
#else
1320+
if constexpr (reducer_list_contains<typename Next::ReducerList,
1321+
VariableReducer>::value) {
1322+
#endif
13131323
if (current_block_needs_variables_) {
13141324
MaybeVariable var = GetVariableFor(old_index);
13151325
if (!var.has_value()) {

0 commit comments

Comments
 (0)