Skip to content

[cheriot] Do not treat setjmp/longjmp builtins as cherilibcallcc. #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 18, 2025
Merged

[cheriot] Do not treat setjmp/longjmp builtins as cherilibcallcc. #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions clang/lib/AST/ASTContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11856,10 +11856,11 @@ QualType ASTContext::GetBuiltinType(unsigned Id,
"'.' should only occur at end of builtin type list!");

bool Variadic = (TypeStr[0] == '.');

bool IsCheriLibcall = Id != Builtin::BIsetjmp && Id != Builtin::BIlongjmp;
IsCheriLibcall &= Target->getTargetOpts().ABI != "cheriot-baremetal";
FunctionType::ExtInfo EI(getDefaultCallingConvention(
Variadic, /*IsCXXMethod=*/false, /*IsBuiltin=*/true,
/*IsLibcall*/ Target->getTargetOpts().ABI != "cheriot-baremetal"));
/*IsLibcall*/ IsCheriLibcall));
if (BuiltinInfo.isNoReturn(Id)) EI = EI.withNoReturn(true);


Expand Down
21 changes: 21 additions & 0 deletions clang/test/CodeGen/cheri/riscv/cheriot-setjmp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// RUN: %clang_cc1 %s -o - "-triple" "riscv32cheriot-unknown-unknown" "-emit-llvm" "-mframe-pointer=none" "-mcmodel=small" "-target-abi" "cheriot" "-Oz" "-Werror" -std=c2x | FileCheck %s
// Verify that setjmp is called without cherilibcallcc
struct __jmp_buf
{
unsigned __cs0;
unsigned __cs1;
unsigned __csp;
unsigned __cra;
};

typedef struct __jmp_buf jmp_buf[1];

__attribute__((returns_twice)) int setjmp(jmp_buf env) __asm__("setjmp");

jmp_buf buf;

// CHECK-LABEL: @test
// CHECK: call i32 @setjmp
void test() {
setjmp(buf);
}