Skip to content

Commit

Permalink
[CFI][annotation] Leave alone function pointers in function annotatio…
Browse files Browse the repository at this point in the history
…ns (#81673)

Function annotation, as part of llvm.metadata, is for the function
itself and doesn't apply to its corresponding jump table entry, so with
CFI we shouldn't replace function pointer in function annotation with
pointer to its corresponding jump table entry.

(cherry picked from commit c7a0db1)
  • Loading branch information
yozhu authored Feb 16, 2024
1 parent e098f6c commit 5750be5
Show file tree
Hide file tree
Showing 2 changed files with 94 additions and 2 deletions.
28 changes: 26 additions & 2 deletions llvm/lib/Transforms/IPO/LowerTypeTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,9 @@ class LowerTypeTestsModule {

Function *WeakInitializerFn = nullptr;

GlobalVariable *GlobalAnnotation;
DenseSet<Value *> FunctionAnnotations;

bool shouldExportConstantsAsAbsoluteSymbols();
uint8_t *exportTypeId(StringRef TypeId, const TypeIdLowering &TIL);
TypeIdLowering importTypeId(StringRef TypeId);
Expand Down Expand Up @@ -531,6 +534,10 @@ class LowerTypeTestsModule {
/// replace each use, which is a direct function call.
void replaceDirectCalls(Value *Old, Value *New);

bool isFunctionAnnotation(Value *V) const {
return FunctionAnnotations.contains(V);
}

public:
LowerTypeTestsModule(Module &M, ModuleAnalysisManager &AM,
ModuleSummaryIndex *ExportSummary,
Expand Down Expand Up @@ -1377,8 +1384,11 @@ void LowerTypeTestsModule::replaceWeakDeclarationWithJumpTablePtr(
// (all?) targets. Switch to a runtime initializer.
SmallSetVector<GlobalVariable *, 8> GlobalVarUsers;
findGlobalVariableUsersOf(F, GlobalVarUsers);
for (auto *GV : GlobalVarUsers)
for (auto *GV : GlobalVarUsers) {
if (GV == GlobalAnnotation)
continue;
moveInitializerToModuleConstructor(GV);
}

// Can not RAUW F with an expression that uses F. Replace with a temporary
// placeholder first.
Expand Down Expand Up @@ -1837,6 +1847,16 @@ LowerTypeTestsModule::LowerTypeTestsModule(
}
OS = TargetTriple.getOS();
ObjectFormat = TargetTriple.getObjectFormat();

// Function annotation describes or applies to function itself, and
// shouldn't be associated with jump table thunk generated for CFI.
GlobalAnnotation = M.getGlobalVariable("llvm.global.annotations");
if (GlobalAnnotation && GlobalAnnotation->hasInitializer()) {
const ConstantArray *CA =
cast<ConstantArray>(GlobalAnnotation->getInitializer());
for (Value *Op : CA->operands())
FunctionAnnotations.insert(Op);
}
}

bool LowerTypeTestsModule::runForTesting(Module &M, ModuleAnalysisManager &AM) {
Expand Down Expand Up @@ -1896,10 +1916,14 @@ void LowerTypeTestsModule::replaceCfiUses(Function *Old, Value *New,
if (isa<BlockAddress, NoCFIValue>(U.getUser()))
continue;

// Skip direct calls to externally defined or non-dso_local functions
// Skip direct calls to externally defined or non-dso_local functions.
if (isDirectCall(U) && (Old->isDSOLocal() || !IsJumpTableCanonical))
continue;

// Skip function annotation.
if (isFunctionAnnotation(U.getUser()))
continue;

// Must handle Constants specially, we cannot call replaceUsesOfWith on a
// constant because they are uniqued.
if (auto *C = dyn_cast<Constant>(U.getUser())) {
Expand Down
68 changes: 68 additions & 0 deletions llvm/test/Transforms/LowerTypeTests/cfi-annotation.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
; REQUIRES: aarch64-registered-target

; RUN: opt -passes=lowertypetests %s -o %t.o
; RUN: llvm-dis %t.o -o - | FileCheck %s --check-prefix=CHECK-foobar
; CHECK-foobar: {{llvm.global.annotations = .*[foo|bar], .*[foo|bar],}}
; RUN: llvm-dis %t.o -o - | FileCheck %s --check-prefix=CHECK-cfi
; CHECK-cfi-NOT: {{llvm.global.annotations = .*cfi.*}}

target triple = "aarch64-none-linux-gnu"

@.src = private unnamed_addr constant [7 x i8] c"test.c\00", align 1
@.str = private unnamed_addr constant [30 x i8] c"annotation_string_literal_bar\00", section "llvm.metadata"
@.str.1 = private unnamed_addr constant [7 x i8] c"test.c\00", section "llvm.metadata"
@.str.2 = private unnamed_addr constant [30 x i8] c"annotation_string_literal_foo\00", section "llvm.metadata"
@llvm.global.annotations = appending global [2 x { ptr, ptr, ptr, i32, ptr }] [{ ptr, ptr, ptr, i32, ptr } { ptr @bar, ptr @.str, ptr @.str.1, i32 2, ptr null }, { ptr, ptr, ptr, i32, ptr } { ptr @foo, ptr @.str.2, ptr @.str.1, i32 1, ptr null }], section "llvm.metadata"

define i32 @bar(i32 noundef %0) #0 !type !8 !type !9 {
%2 = alloca i32, align 4
store i32 %0, ptr %2, align 4
%3 = load i32, ptr %2, align 4
%4 = call i32 @foo(i32 noundef %3)
ret i32 %4
}

declare !type !8 !type !9 i32 @foo(i32 noundef) #1

define i32 @test(i32 noundef %0) #0 !type !8 !type !9 {
%2 = alloca i32, align 4
%3 = alloca ptr, align 8
store i32 %0, ptr %2, align 4
%4 = load i32, ptr %2, align 4
%5 = icmp sgt i32 %4, 0
%6 = zext i1 %5 to i64
%7 = select i1 %5, ptr @foo, ptr @bar
store ptr %7, ptr %3, align 8
%8 = load ptr, ptr %3, align 8
%9 = call i1 @llvm.type.test(ptr %8, metadata !"_ZTSFiiE"), !nosanitize !10
br i1 %9, label %11, label %10, !nosanitize !10

10:
call void @llvm.ubsantrap(i8 2) #4, !nosanitize !10
unreachable, !nosanitize !10

11:
%12 = load i32, ptr %2, align 4
%13 = call i32 %8(i32 noundef %12)
ret i32 %13
}

declare i1 @llvm.type.test(ptr, metadata)
declare void @llvm.ubsantrap(i8 immarg)

attributes #0 = { noinline nounwind optnone uwtable "frame-pointer"="non-leaf" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="generic" "target-features"="+fp-armv8,+neon,+v8a,-fmv" }
attributes #1 = { "frame-pointer"="non-leaf" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="generic" "target-features"="+fp-armv8,+neon,+v8a,-fmv" }
attributes #4 = { noreturn nounwind }

!llvm.module.flags = !{!0, !1, !2, !3, !4, !5, !6}

!0 = !{i32 1, !"wchar_size", i32 4}
!1 = !{i32 4, !"CFI Canonical Jump Tables", i32 0}
!2 = !{i32 8, !"PIC Level", i32 2}
!3 = !{i32 7, !"uwtable", i32 2}
!4 = !{i32 7, !"frame-pointer", i32 1}
!5 = !{i32 1, !"ThinLTO", i32 0}
!6 = !{i32 1, !"EnableSplitLTOUnit", i32 1}
!8 = !{i64 0, !"_ZTSFiiE"}
!9 = !{i64 0, !"_ZTSFiiE.generalized"}
!10 = !{}

0 comments on commit 5750be5

Please sign in to comment.