Mirrors/node
1
0
Fork 0
mirror of https://github.com/nodejs/node.git synced 2025-12-28 07:50:41 +00:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

deps: V8: backport 151d0a44a1b2

Browse Source 
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: 151d0a44a1
Co-authored-by: Michaël Zasso <targos@protonmail.com>
PR-URL: https://github.com/nodejs/node/pull/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>
This commit is contained in:
Abdirahim Musse 2025-10-31 21:09:18 -05:00 committed by Michaël Zasso
parent b59af772dc
commit bf5c6a8bd4
No known key found for this signature in database
GPG Key ID: 770F7A9A5AE15600
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.gypi
View File

@ -38,7 +38,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.8',
'v8_embedder_string': '-node.9',
##### V8 defaults for Node.js #####

26
deps/v8/src/wasm/wasm-objects.cc vendored
View File

@ -2519,12 +2519,12 @@ void WasmDispatchTable::SetForNonWrapper(
uint32_t function_index,
#endif // V8_ENABLE_DRUMBRAKE
WasmDispatchTable::NewOrExistingEntry new_or_existing) {
return SetForNonWrapper<WasmDispatchTable>(*this, index, implicit_arg,
call_target, sig_id,
return ::v8::internal::SetForNonWrapper<WasmDispatchTable>(
*this, index, implicit_arg, call_target, sig_id,
#if V8_ENABLE_DRUMBRAKE
function_index,
function_index,
#endif
new_or_existing);
new_or_existing);
}
void WasmDispatchTableForImports::SetForNonWrapper(
@ -2534,7 +2534,7 @@ void WasmDispatchTableForImports::SetForNonWrapper(
uint32_t function_index,
#endif // V8_ENABLE_DRUMBRAKE
WasmDispatchTable::NewOrExistingEntry new_or_existing) {
return SetForNonWrapper<WasmDispatchTableForImports>(
return ::v8::internal::SetForNonWrapper<WasmDispatchTableForImports>(
*this, index, implicit_arg, call_target, sig_id,
#if V8_ENABLE_DRUMBRAKE
function_index,
@ -2595,12 +2595,12 @@ void WasmDispatchTable::SetForWrapper(
uint32_t function_index,
#endif // V8_ENABLE_DRUMBRAKE
WasmDispatchTable::NewOrExistingEntry new_or_existing) {
return SetForWrapper<WasmDispatchTable>(*this, index, implicit_arg,
wrapper_handle, sig_id,
return ::v8::internal::SetForWrapper<WasmDispatchTable>(
*this, index, implicit_arg, wrapper_handle, sig_id,
#if V8_ENABLE_DRUMBRAKE
function_index,
function_index,
#endif // V8_ENABLE_DRUMBRAKE
new_or_existing);
new_or_existing);
}
void WasmDispatchTableForImports::SetForWrapper(
@ -2611,12 +2611,12 @@ void WasmDispatchTableForImports::SetForWrapper(
uint32_t function_index,
#endif // V8_ENABLE_DRUMBRAKE
WasmDispatchTable::NewOrExistingEntry new_or_existing) {
return SetForWrapper<WasmDispatchTableForImports>(*this, index, implicit_arg,
wrapper_handle, sig_id,
return ::v8::internal::SetForWrapper<WasmDispatchTableForImports>(
*this, index, implicit_arg, wrapper_handle, sig_id,
#if V8_ENABLE_DRUMBRAKE
function_index,
function_index,
#endif // V8_ENABLE_DRUMBRAKE
new_or_existing);
new_or_existing);
}
template <AnyWasmDispatchTable DispatchTable>