Skip to content

Commit af3acec

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}. [email protected] Bug: v8:12527 Change-Id: Ifd906afb5f034f05c2bf7d9a28e3ab458549e7ef Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3372915 Reviewed-by: Andreas Haas <[email protected]> Commit-Queue: Clemens Backes <[email protected]> Cr-Commit-Position: refs/heads/main@{#78515} Refs: v8/v8@3b6b21f Fixes: #41402 PR-URL: #41457 Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Darshan Sen <[email protected]>
1 parent 6aec92f commit af3acec

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.12',
39+
'v8_embedder_string': '-node.13',
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
@@ -438,7 +438,7 @@ inline void EmitAnyTrue(LiftoffAssembler* assm, LiftoffRegister dst,
438438

439439
int LiftoffAssembler::PrepareStackFrame() {
440440
if (!CpuFeatures::IsSupported(ARMv7)) {
441-
bailout(kUnsupportedArchitecture, "Armv6 not supported");
441+
bailout(kUnsupportedArchitecture, "Liftoff needs ARMv7");
442442
return 0;
443443
}
444444
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
@@ -310,6 +310,13 @@ void CheckBailoutAllowed(LiftoffBailoutReason reason, const char* detail,
310310
return;
311311
#endif
312312

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+
313320
#define LIST_FEATURE(name, ...) kFeature_##name,
314321
constexpr WasmFeatures kExperimentalFeatures{
315322
FOREACH_WASM_EXPERIMENTAL_FEATURE_FLAG(LIST_FEATURE)};

0 commit comments

Comments
 (0)