Skip to content

Commit a546d83

Browse files
joyeecheungtargos
authored andcommitted
deps: V8: cherry-pick a580b463ac35
Original commit message: use explicit v8::String namespace in internal code This otherwise does not compile with clangcl 18.1 on Windows because it would be inferred as v8::internal::String Refs: nodejs#56959 Change-Id: Ia14e2a5c2a730772a64e1c31019d0144d4eeb78f Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/6271543 Reviewed-by: Michael Lippautz <[email protected]> Commit-Queue: Joyee Cheung <[email protected]> Cr-Commit-Position: refs/heads/main@{#98734} Refs: v8/v8@a580b46
1 parent 517d514 commit a546d83

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

common.gypi

+1-1
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.11',
41+
'v8_embedder_string': '-node.12',
4242

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

deps/v8/src/wasm/wasm-module-sourcemap.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ WasmModuleSourceMap::WasmModuleSourceMap(v8::Isolate* v8_isolate,
6969
size_t file_name_sz = file_name->Utf8LengthV2(v8_isolate) + 1;
7070
std::unique_ptr<char[]> file_name_buf(new char[file_name_sz]);
7171
file_name->WriteUtf8V2(v8_isolate, file_name_buf.get(), file_name_sz,
72-
String::WriteFlags::kNullTerminate);
72+
v8::String::WriteFlags::kNullTerminate);
7373
filenames.emplace_back(file_name_buf.get());
7474
}
7575

@@ -84,7 +84,7 @@ WasmModuleSourceMap::WasmModuleSourceMap(v8::Isolate* v8_isolate,
8484
size_t mappings_sz = mappings->Utf8LengthV2(v8_isolate) + 1;
8585
std::unique_ptr<char[]> mappings_buf(new char[mappings_sz]);
8686
mappings->WriteUtf8V2(v8_isolate, mappings_buf.get(), mappings_sz,
87-
String::WriteFlags::kNullTerminate);
87+
v8::String::WriteFlags::kNullTerminate);
8888

8989
valid_ = DecodeMapping(mappings_buf.get());
9090
}

0 commit comments

Comments
 (0)