diff --git a/clang/lib/CodeGen/CGExpr.cpp b/clang/lib/CodeGen/CGExpr.cpp
index dd940827b34d2ae39e676c22c689dc40576bc5c7..7a8a42b7429b30f194672733bc4ccef05bdebc02 100644
--- a/clang/lib/CodeGen/CGExpr.cpp
+++ b/clang/lib/CodeGen/CGExpr.cpp
@@ -3469,16 +3469,14 @@ void CodeGenFunction::EmitCfiCheckStub() {
       llvm::GlobalValue::WeakAnyLinkage, "__cfi_check", M);
   CGM.SetLLVMFunctionAttributes(GlobalDecl(), FI, F, /*IsThunk=*/false);
   CGM.SetLLVMFunctionAttributesForDefinition(nullptr, F);
+  F->setAlignment(llvm::Align(4096));
   // OHOS_LOCAL end
   CGM.setDSOLocal(F);
 
   llvm::BasicBlock *BB = llvm::BasicBlock::Create(Ctx, "entry", F);
-  // FIXME: consider emitting an intrinsic call like
-  // call void @llvm.cfi_check(i64 %0, i8* %1, i8* %2)
-  // which can be lowered in CrossDSOCFI pass to the actual contents of
-  // __cfi_check. This would allow inlining of __cfi_check calls.
-  llvm::CallInst::Create(
-      llvm::Intrinsic::getDeclaration(M, llvm::Intrinsic::trap), "", BB);
+  // CrossDSOCFI pass is not executed if there is no executable code.
+  SmallVector<llvm::Value*> FailArgs{F->getArg(2), F->getArg(1)};
+  llvm::CallInst::Create(M->getFunction("__cfi_check_fail"), FailArgs, "", BB);
   llvm::ReturnInst::Create(Ctx, nullptr, BB);
 }
 
diff --git a/clang/test/CodeGen/cfi-check-fail.c b/clang/test/CodeGen/cfi-check-fail.c
index 89d5bac4c174d98d09dca5fdca9fd322e823da59..4f12d171739dc5cbcfa7c5138b2855b406577e19 100644
--- a/clang/test/CodeGen/cfi-check-fail.c
+++ b/clang/test/CodeGen/cfi-check-fail.c
@@ -74,8 +74,8 @@ void caller(void (*f)(void)) {
 // CHECK:   ret void
 
 // OHOS_LOCAL begin
-// CHECK: define weak void @__cfi_check(i64 noundef %0, i8* noundef %1, i8* noundef %2)
+// CHECK: define weak void @__cfi_check(i64 noundef %[[TYPE:.*]], i8* noundef %[[ADDR:.*]], i8* noundef %[[DATA:.*]]) {{.*}} align 4096
 // OHOS_LOCAL end
 // CHECK-NOT: }
-// CHECK: call void @llvm.trap()
+// CHECK: call void @__cfi_check_fail(i8* %[[DATA]], i8* %[[ADDR]])
 // CHECK-NEXT: ret void