|
| 1 | +diff --git a/BUILD.gn b/BUILD.gn |
| 2 | +index a25b6f2ac986..e2e0c16d9708 100644 |
| 3 | +--- a/BUILD.gn |
| 4 | ++++ b/BUILD.gn |
| 5 | +@@ -1716,6 +1716,10 @@ config("toolchain") { |
| 6 | + |
| 7 | + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108517 |
| 8 | + "-Wno-nonnull", |
| 9 | ++ |
| 10 | ++ # Disable dangling pointer warnings, which are often false positives when |
| 11 | ++ # using scopes. |
| 12 | ++ "-Wno-dangling-pointer", |
| 13 | + ] |
| 14 | + } |
| 15 | + |
| 16 | +diff --git a/src/base/logging.h b/src/base/logging.h |
| 17 | +index 0139cb10cee7..e68e79ebaac0 100644 |
| 18 | +--- a/src/base/logging.h |
| 19 | ++++ b/src/base/logging.h |
| 20 | +@@ -61,7 +61,7 @@ constexpr const char* kUnreachableCodeMessage = "unreachable code"; |
| 21 | + } // namespace v8::base |
| 22 | + |
| 23 | + #define UNIMPLEMENTED() FATAL(::v8::base::kUnimplementedCodeMessage) |
| 24 | +-#define UNREACHABLE() FATAL(::v8::base::kUnreachableCodeMessage) |
| 25 | ++#define UNREACHABLE() abort() |
| 26 | + // g++ versions <= 8 cannot use UNREACHABLE() in a constexpr function. |
| 27 | + // TODO(miladfarca): Remove once all compilers handle this properly. |
| 28 | + #if defined(__GNUC__) && !defined(__clang__) && (__GNUC__ <= 8) |
| 29 | +diff --git a/src/compiler/turboshaft/assembler.h b/src/compiler/turboshaft/assembler.h |
| 30 | +index e324c82b08cf..8493aca79ddc 100644 |
| 31 | +--- a/src/compiler/turboshaft/assembler.h |
| 32 | ++++ b/src/compiler/turboshaft/assembler.h |
| 33 | +@@ -6,6 +6,7 @@ |
| 34 | + #define V8_COMPILER_TURBOSHAFT_ASSEMBLER_H_ |
| 35 | + |
| 36 | + #include <cstring> |
| 37 | ++#include <iomanip> |
| 38 | + #include <iterator> |
| 39 | + #include <limits> |
| 40 | + #include <memory> |
| 41 | +diff --git a/src/compiler/wasm-compiler.cc b/src/compiler/wasm-compiler.cc |
| 42 | +index 16f1f1470b78..b4813b9ff759 100644 |
| 43 | +--- a/src/compiler/wasm-compiler.cc |
| 44 | ++++ b/src/compiler/wasm-compiler.cc |
| 45 | +@@ -8613,11 +8613,13 @@ wasm::WasmCompilationResult CompileWasmImportCallWrapper( |
| 46 | + '-'); |
| 47 | + |
| 48 | + auto compile_with_turboshaft = [&]() { |
| 49 | ++ wasm::WrapperCompilationInfo ci; |
| 50 | ++ ci.code_kind = CodeKind::WASM_TO_JS_FUNCTION; |
| 51 | ++ ci.import_info.import_kind = kind; |
| 52 | ++ ci.import_info.expected_arity = expected_arity; |
| 53 | ++ ci.import_info.suspend = suspend; |
| 54 | + return Pipeline::GenerateCodeForWasmNativeStubFromTurboshaft( |
| 55 | +- env->module, sig, |
| 56 | +- wasm::WrapperCompilationInfo{ |
| 57 | +- .code_kind = CodeKind::WASM_TO_JS_FUNCTION, |
| 58 | +- .import_info = {kind, expected_arity, suspend}}, |
| 59 | ++ env->module, sig, ci, |
| 60 | + func_name, WasmStubAssemblerOptions(), nullptr); |
| 61 | + }; |
| 62 | + auto compile_with_turbofan = [&]() { |
| 63 | +@@ -8774,12 +8776,14 @@ MaybeHandle<Code> CompileWasmToJSWrapper(Isolate* isolate, |
| 64 | + base::VectorOf(name_buffer.get(), kMaxNameLen) + kNamePrefixLen, sig); |
| 65 | + |
| 66 | + auto compile_with_turboshaft = [&]() { |
| 67 | ++ wasm::WrapperCompilationInfo ci; |
| 68 | ++ ci.code_kind = CodeKind::WASM_TO_JS_FUNCTION; |
| 69 | ++ ci.import_info.import_kind = kind; |
| 70 | ++ ci.import_info.expected_arity = expected_arity; |
| 71 | ++ ci.import_info.suspend = suspend; |
| 72 | + std::unique_ptr<turboshaft::TurboshaftCompilationJob> job = |
| 73 | + Pipeline::NewWasmTurboshaftWrapperCompilationJob( |
| 74 | +- isolate, sig, |
| 75 | +- wasm::WrapperCompilationInfo{ |
| 76 | +- .code_kind = CodeKind::WASM_TO_JS_FUNCTION, |
| 77 | +- .import_info = {kind, expected_arity, suspend}}, |
| 78 | ++ isolate, sig, ci, |
| 79 | + nullptr, std::move(name_buffer), WasmAssemblerOptions()); |
| 80 | + |
| 81 | + // Compile the wrapper |
| 82 | +diff --git a/src/wasm/wasm-disassembler.cc b/src/wasm/wasm-disassembler.cc |
| 83 | +index 6c5da414047f..1690ca026e75 100644 |
| 84 | +--- a/src/wasm/wasm-disassembler.cc |
| 85 | ++++ b/src/wasm/wasm-disassembler.cc |
| 86 | +@@ -4,6 +4,8 @@ |
| 87 | + |
| 88 | + #include "src/wasm/wasm-disassembler.h" |
| 89 | + |
| 90 | ++#include <iomanip> |
| 91 | ++ |
| 92 | + #include "src/debug/debug-interface.h" |
| 93 | + #include "src/numbers/conversions.h" |
| 94 | + #include "src/wasm/module-decoder-impl.h" |
0 commit comments