Skip to content

Commit 91cf835

Browse files
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 5ea28b7 commit 91cf835

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

common.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

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

4141
##### V8 defaults for Node.js #####
4242

deps/v8/src/wasm/baseline/arm/liftoff-assembler-arm.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ inline void EmitAnyTrue(LiftoffAssembler* assm, LiftoffRegister dst,
442442

443443
int LiftoffAssembler::PrepareStackFrame() {
444444
if (!CpuFeatures::IsSupported(ARMv7)) {
445-
bailout(kUnsupportedArchitecture, "Armv6 not supported");
445+
bailout(kUnsupportedArchitecture, "Liftoff needs ARMv7");
446446
return 0;
447447
}
448448
uint32_t offset = static_cast<uint32_t>(pc_offset());

deps/v8/src/wasm/baseline/liftoff-compiler.cc

+7
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,13 @@ void CheckBailoutAllowed(LiftoffBailoutReason reason, const char* detail,
316316
return;
317317
#endif
318318

319+
#if V8_TARGET_ARCH_ARM
320+
// Allow bailout for missing ARMv7 support.
321+
if (!CpuFeatures::IsSupported(ARMv7) && reason == kUnsupportedArchitecture) {
322+
return;
323+
}
324+
#endif
325+
319326
#define LIST_FEATURE(name, ...) kFeature_##name,
320327
constexpr WasmFeatures kExperimentalFeatures{
321328
FOREACH_WASM_EXPERIMENTAL_FEATURE_FLAG(LIST_FEATURE)};

0 commit comments

Comments
 (0)