FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

deps: V8: backport 151d0a44a1b2 · nodejs/node@bf5c6a8 · GitHub

/ node Public

Commit bf5c6a8

Browse files
abmusse
and
targos
committed
deps: V8: backport 151d0a44a1b2
Original commit message: Fix gcc build For json-parser.h: ``` ../../src/json/json-parser.h:298:13: error: explicit specialization in non-namespace scope 'class v8::internal::JsonParser<Char>' 298 | template <> | ^ ../../src/json/json-parser.h:299:18: error: template-id 'IsNextToken<v8::internal::JsonToken::EOS>' in declaration of primary template 299 | V8_INLINE bool IsNextToken<JsonToken::EOS>() { | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ ``` For wasm-objects.cc: ``` ../../src/wasm/wasm-objects.cc:2522:45: error: no matching function for call to 'v8::internal::WasmDispatchTable::SetForNonWrapper<v8::internal::WasmDispatchTable>( v8::internal::WasmDispatchTable&, int&, v8::internal::Tagged<v8::internal:: Union<v8::internal::Smi, v8::internal::WasmTrustedInstanceData> >&, v8::internal::WasmCodePointer&, v8::internal::wasm::CanonicalTypeIndex&, v8::internal::WasmDispatchTable::NewOrExistingEntry&)' ``` ``` error: no matching function for call to 'v8::internal::WasmDispatchTable:: SetForWrapper<v8::internal::WasmDispatchTable>(v8::internal::WasmDispatchTable&, int&, v8::internal::Tagged<v8::internal::WasmImportData>&, std::shared_ptr<v8:: internal::wasm::WasmImportWrapperHandle>&, v8::internal::wasm:: CanonicalTypeIndex&, v8::internal::WasmDispatchTable::NewOrExistingEntry&)' ``` For the fix fully qualify calls to SetForWrapper and SetForNonWrapper with ::v8::internal:: to avoid accidental lookup of class member names. This resolves template resolution errors caused by unqualified calls inside WasmDispatchTable and WasmDispatchTableForImports member functions. Change-Id: I687935a05dc754db686deaa0f93079d350aae07e Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/7107891 Reviewed-by: Patrick Thier <pthier@chromium.org> Reviewed-by: Manos Koukoutos <manoskouk@chromium.org> Commit-Queue: Milad Farazmand <mfarazma@ibm.com> Cr-Commit-Position: refs/heads/main@{#103547} Refs: v8/v8@151d0a4 Co-authored-by: Michaël Zasso <targos@protonmail.com> PR-URL: #60488 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Chengzhong Wu <legendecas@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Richard Lau <richard.lau@ibm.com>
1 parent b59af77 commit bf5c6a8

2 files changed

Lines changed: 14 additions & 14 deletions

File tree

‎common.gypi‎

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

3939
# Reset this number to 0 on major V8 upgrades.
4040
# Increment by one for each non-official patch applied to deps/v8.
41-
'v8_embedder_string': '-node.8',
41+
'v8_embedder_string': '-node.9',
4242

4343
##### V8 defaults for Node.js #####
4444

‎deps/v8/src/wasm/wasm-objects.cc‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2519,12 +2519,12 @@ void WasmDispatchTable::SetForNonWrapper(
25192519
uint32_t function_index,
25202520
#endif // V8_ENABLE_DRUMBRAKE
25212521
WasmDispatchTable::NewOrExistingEntry new_or_existing) {
2522-
return SetForNonWrapper<WasmDispatchTable>(*this, index, implicit_arg,
2523-
call_target, sig_id,
2522+
return ::v8::internal::SetForNonWrapper<WasmDispatchTable>(
2523+
*this, index, implicit_arg, call_target, sig_id,
25242524
#if V8_ENABLE_DRUMBRAKE
2525-
function_index,
2525+
function_index,
25262526
#endif
2527-
new_or_existing);
2527+
new_or_existing);
25282528
}
25292529

25302530
void WasmDispatchTableForImports::SetForNonWrapper(
@@ -2534,7 +2534,7 @@ void WasmDispatchTableForImports::SetForNonWrapper(
25342534
uint32_t function_index,
25352535
#endif // V8_ENABLE_DRUMBRAKE
25362536
WasmDispatchTable::NewOrExistingEntry new_or_existing) {
2537-
return SetForNonWrapper<WasmDispatchTableForImports>(
2537+
return ::v8::internal::SetForNonWrapper<WasmDispatchTableForImports>(
25382538
*this, index, implicit_arg, call_target, sig_id,
25392539
#if V8_ENABLE_DRUMBRAKE
25402540
function_index,
@@ -2595,12 +2595,12 @@ void WasmDispatchTable::SetForWrapper(
25952595
uint32_t function_index,
25962596
#endif // V8_ENABLE_DRUMBRAKE
25972597
WasmDispatchTable::NewOrExistingEntry new_or_existing) {
2598-
return SetForWrapper<WasmDispatchTable>(*this, index, implicit_arg,
2599-
wrapper_handle, sig_id,
2598+
return ::v8::internal::SetForWrapper<WasmDispatchTable>(
2599+
*this, index, implicit_arg, wrapper_handle, sig_id,
26002600
#if V8_ENABLE_DRUMBRAKE
2601-
function_index,
2601+
function_index,
26022602
#endif // V8_ENABLE_DRUMBRAKE
2603-
new_or_existing);
2603+
new_or_existing);
26042604
}
26052605

26062606
void WasmDispatchTableForImports::SetForWrapper(
@@ -2611,12 +2611,12 @@ void WasmDispatchTableForImports::SetForWrapper(
26112611
uint32_t function_index,
26122612
#endif // V8_ENABLE_DRUMBRAKE
26132613
WasmDispatchTable::NewOrExistingEntry new_or_existing) {
2614-
return SetForWrapper<WasmDispatchTableForImports>(*this, index, implicit_arg,
2615-
wrapper_handle, sig_id,
2614+
return ::v8::internal::SetForWrapper<WasmDispatchTableForImports>(
2615+
*this, index, implicit_arg, wrapper_handle, sig_id,
26162616
#if V8_ENABLE_DRUMBRAKE
2617-
function_index,
2617+
function_index,
26182618
#endif // V8_ENABLE_DRUMBRAKE
2619-
new_or_existing);
2619+
new_or_existing);
26202620
}
26212621

26222622
template <AnyWasmDispatchTable DispatchTable>

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL