Commit af3acec
committed
deps: V8: cherry-pick 3b6b21f595f6
Original commit message:
[liftoff] Allow bailout for missing ARMv7
The bailout is there explicitly in the code, so we should allow it in
{CheckBailoutAllowed}.
R=ahaas@chromium.org
Bug: v8:12527
Change-Id: Ifd906afb5f034f05c2bf7d9a28e3ab458549e7ef
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3372915
Reviewed-by: Andreas Haas <ahaas@chromium.org>
Commit-Queue: Clemens Backes <clemensb@chromium.org>
Cr-Commit-Position: refs/heads/main@{#78515}
Refs: v8/v8@3b6b21f
Fixes: #41402
PR-URL: #41457
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Darshan Sen <raisinten@gmail.com>1 parent 6aec92f commit af3acec
3 files changed
Lines changed: 9 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -36,7 +36,7 @@ | |||
| 36 | 36 | ||
| 37 | 37 | # Reset this number to 0 on major V8 upgrades. | |
| 38 | 38 | # Increment by one for each non-official patch applied to deps/v8. | |
| 39 | - 'v8_embedder_string': '-node.12', | ||
| 39 | + 'v8_embedder_string': '-node.13', | ||
| 40 | 40 | ||
| 41 | 41 | ##### V8 defaults for Node.js ##### | |
| 42 | 42 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -438,7 +438,7 @@ inline void EmitAnyTrue(LiftoffAssembler* assm, LiftoffRegister dst, | |||
| 438 | 438 | ||
| 439 | 439 | int LiftoffAssembler::PrepareStackFrame() { | |
| 440 | 440 | if (!CpuFeatures::IsSupported(ARMv7)) { | |
| 441 | - bailout(kUnsupportedArchitecture, "Armv6 not supported"); | ||
| 441 | + bailout(kUnsupportedArchitecture, "Liftoff needs ARMv7"); | ||
| 442 | 442 | return 0; | |
| 443 | 443 | } | |
| 444 | 444 | uint32_t offset = static_cast<uint32_t>(pc_offset()); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -310,6 +310,13 @@ void CheckBailoutAllowed(LiftoffBailoutReason reason, const char* detail, | |||
| 310 | 310 | return; | |
| 311 | 311 | #endif | |
| 312 | 312 | ||
| 313 | + #if V8_TARGET_ARCH_ARM | ||
| 314 | + // Allow bailout for missing ARMv7 support. | ||
| 315 | + if (!CpuFeatures::IsSupported(ARMv7) && reason == kUnsupportedArchitecture) { | ||
| 316 | + return; | ||
| 317 | + } | ||
| 318 | + #endif | ||
| 319 | + | ||
| 313 | 320 | #define LIST_FEATURE(name, ...) kFeature_##name, | |
| 314 | 321 | constexpr WasmFeatures kExperimentalFeatures{ | |
| 315 | 322 | FOREACH_WASM_EXPERIMENTAL_FEATURE_FLAG(LIST_FEATURE)}; | |
0 commit comments