[liftoff] Allow bailout for missing ARMv7

backes · V8 LUCI CQ · commit 3b6b21f595f6 · 2022-01-07T16:50:55.000Z
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}
diff --git a/src/wasm/baseline/arm/liftoff-assembler-arm.h b/src/wasm/baseline/arm/liftoff-assembler-arm.h
@@ -442,7 +442,7 @@ inline void EmitAnyTrue(LiftoffAssembler* assm, LiftoffRegister dst,
 
 int LiftoffAssembler::PrepareStackFrame() {
   if (!CpuFeatures::IsSupported(ARMv7)) {
-    bailout(kUnsupportedArchitecture, "Armv6 not supported");
+    bailout(kUnsupportedArchitecture, "Liftoff needs ARMv7");
     return 0;
   }
   uint32_t offset = static_cast<uint32_t>(pc_offset());
diff --git a/src/wasm/baseline/liftoff-compiler.cc b/src/wasm/baseline/liftoff-compiler.cc
@@ -316,6 +316,13 @@ void CheckBailoutAllowed(LiftoffBailoutReason reason, const char* detail,
   return;
 #endif
 
+#if V8_TARGET_ARCH_ARM
+  // Allow bailout for missing ARMv7 support.
+  if (!CpuFeatures::IsSupported(ARMv7) && reason == kUnsupportedArchitecture) {
+    return;
+  }
+#endif
+
 #define LIST_FEATURE(name, ...) kFeature_##name,
   constexpr WasmFeatures kExperimentalFeatures{
       FOREACH_WASM_EXPERIMENTAL_FEATURE_FLAG(LIST_FEATURE)};

Original file line number	Diff line number	Diff line change
`@@ -442,7 +442,7 @@ inline void EmitAnyTrue(LiftoffAssembler* assm, LiftoffRegister dst,`
`442`	`442`
`443`	`443`	`int LiftoffAssembler::PrepareStackFrame() {`
`444`	`444`	`if (!CpuFeatures::IsSupported(ARMv7)) {`
`445`		`- bailout(kUnsupportedArchitecture, "Armv6 not supported");`
	`445`	`+ bailout(kUnsupportedArchitecture, "Liftoff needs ARMv7");`
`446`	`446`	`return 0;`
`447`	`447`	`}`
`448`	`448`	`uint32_t offset = static_cast<uint32_t>(pc_offset());`