commit 49a3cb4eeb2d89fd109e2e1371b35fa0fabfa197
author Jesse Huang <jesse.huang@sifive.com> Tue Sep 09 23:49:40 2025 +0900
committer Copybara-Service <copybara-worker@google.com> Tue Sep 09 07:51:22 2025 -0700
tree 2fda0482c64efb7532c42cf8f30e175d42155f75
parent 442cb30a02d3d353e98595c925bca98782f7a8c6

[Clang][RISCV] Loosen the requirement of -fcf-protection=return to zimop (#152252)

Following https://github.com/llvm/llvm-project/pull/152251
We can now loosen the requirement of `-fcf-protection=return` from
Zicfiss to Zimop

GitOrigin-RevId: e91f3674198707531a6d97632a6bd8e446c67633

lib/Basic/Targets/RISCV.h

diff --git a/lib/Basic/Targets/RISCV.h b/lib/Basic/Targets/RISCV.h
index 58bfad1..d8b0e64 100644
--- a/lib/Basic/Targets/RISCV.h
+++ b/lib/Basic/Targets/RISCV.h
@@ -147,7 +147,7 @@
 
   bool
   checkCFProtectionReturnSupported(DiagnosticsEngine &Diags) const override {
-    if (ISAInfo->hasExtension("zicfiss"))
+    if (ISAInfo->hasExtension("zimop"))
       return true;
     return TargetInfo::checkCFProtectionReturnSupported(Diags);
   }

test/CodeGen/RISCV/attr-hw-shadow-stack.c

diff --git a/test/CodeGen/RISCV/attr-hw-shadow-stack.c b/test/CodeGen/RISCV/attr-hw-shadow-stack.c
index cabff7e..8dfdc8c 100644
--- a/test/CodeGen/RISCV/attr-hw-shadow-stack.c
+++ b/test/CodeGen/RISCV/attr-hw-shadow-stack.c
@@ -1,7 +1,7 @@
-// RUN: %clang_cc1 -triple riscv64 -target-feature +experimental-zicfiss -emit-llvm -o - %s -fcf-protection=return | FileCheck %s
-// RUN: %clang_cc1 -triple riscv64 -target-feature +experimental-zicfiss -emit-llvm -o - %s | FileCheck -check-prefix=NOSHADOWSTACK %s
-// RUN: %clang_cc1 -triple riscv32 -target-feature +experimental-zicfiss -emit-llvm -o - %s -fcf-protection=return | FileCheck %s
-// RUN: %clang_cc1 -triple riscv32 -target-feature +experimental-zicfiss -emit-llvm -o - %s | FileCheck -check-prefix=NOSHADOWSTACK %s
+// RUN: %clang_cc1 -triple riscv64 -target-feature +zimop -emit-llvm -o - %s -fcf-protection=return | FileCheck %s
+// RUN: %clang_cc1 -triple riscv64 -target-feature +zimop -emit-llvm -o - %s | FileCheck -check-prefix=NOSHADOWSTACK %s
+// RUN: %clang_cc1 -triple riscv32 -target-feature +zimop -emit-llvm -o - %s -fcf-protection=return | FileCheck %s
+// RUN: %clang_cc1 -triple riscv32 -target-feature +zimop -emit-llvm -o - %s | FileCheck -check-prefix=NOSHADOWSTACK %s
 
 int foo(int *a) { return *a; }