Skip to content

Conversation

@thurstond
Copy link
Contributor

These tests will track progress on extending
#139809 from CFI to more UBSan checks.

These tests will track progress on extending
llvm#139809 from CFI to more UBSan
checks.
@thurstond thurstond requested review from fmayer and vitalybuka May 28, 2025 17:58
@llvmbot llvmbot added the clang Clang issues not falling into any other category label May 28, 2025
@llvmbot
Copy link
Member

llvmbot commented May 28, 2025

@llvm/pr-subscribers-clang

Author: Thurston Dang (thurstond)

Changes

These tests will track progress on extending
#139809 from CFI to more UBSan checks.


Full diff: https://github.com/llvm/llvm-project/pull/141814.diff

2 Files Affected:

  • (added) clang/test/CodeGen/ubsan-function-debuginfo.c (+74)
  • (added) clang/test/CodeGen/unsigned-promotion-debuginfo.c (+95)
diff --git a/clang/test/CodeGen/ubsan-function-debuginfo.c b/clang/test/CodeGen/ubsan-function-debuginfo.c
new file mode 100644
index 0000000000000..c452b84907045
--- /dev/null
+++ b/clang/test/CodeGen/ubsan-function-debuginfo.c
@@ -0,0 +1,74 @@
+// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 5
+// RUN: %clang_cc1 -emit-llvm -triple x86_64 -std=c17 -fsanitize=function %s -o - \
+// RUN:   -fdebug-prefix-map=%S/= -fno-ident -fdebug-compilation-dir=%S -debug-info-kind=limited \
+// RUN:   -fsanitize-annotate-debug-info=function \
+// RUN:   | FileCheck %s
+
+// CHECK-LABEL: define dso_local void @call_no_prototype(
+// CHECK-SAME: ptr noundef [[F:%.*]]) #[[ATTR0:[0-9]+]] !dbg [[DBG4:![0-9]+]] !func_sanitize [[META12:![0-9]+]] {
+// CHECK-NEXT:  [[ENTRY:.*:]]
+// CHECK-NEXT:    [[F_ADDR:%.*]] = alloca ptr, align 8
+// CHECK-NEXT:    store ptr [[F]], ptr [[F_ADDR]], align 8
+// CHECK-NEXT:      #dbg_declare(ptr [[F_ADDR]], [[META13:![0-9]+]], !DIExpression(), [[META14:![0-9]+]])
+// CHECK-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[F_ADDR]], align 8, !dbg [[DBG15:![0-9]+]]
+// CHECK-NEXT:    call void (...) [[TMP0]](), !dbg [[DBG15]]
+// CHECK-NEXT:    ret void, !dbg [[DBG16:![0-9]+]]
+//
+void call_no_prototype(void (*f)()) { f(); }
+
+// CHECK-LABEL: define dso_local void @call_prototype(
+// CHECK-SAME: ptr noundef [[F:%.*]]) #[[ATTR0]] !dbg [[DBG17:![0-9]+]] !func_sanitize [[META23:![0-9]+]] {
+// CHECK-NEXT:  [[ENTRY:.*:]]
+// CHECK-NEXT:    [[F_ADDR:%.*]] = alloca ptr, align 8
+// CHECK-NEXT:    store ptr [[F]], ptr [[F_ADDR]], align 8
+// CHECK-NEXT:      #dbg_declare(ptr [[F_ADDR]], [[META24:![0-9]+]], !DIExpression(), [[META25:![0-9]+]])
+// CHECK-NEXT:    [[TMP0:%.*]] = load ptr, ptr [[F_ADDR]], align 8, !dbg [[DBG26:![0-9]+]]
+// CHECK-NEXT:    [[TMP1:%.*]] = getelementptr <{ i32, i32 }>, ptr [[TMP0]], i32 -1, i32 0, !dbg [[DBG26]], !nosanitize [[META11:![0-9]+]]
+// CHECK-NEXT:    [[TMP2:%.*]] = load i32, ptr [[TMP1]], align 4, !dbg [[DBG26]], !nosanitize [[META11]]
+// CHECK-NEXT:    [[TMP3:%.*]] = icmp eq i32 [[TMP2]], -1056584962, !dbg [[DBG26]], !nosanitize [[META11]]
+// CHECK-NEXT:    br i1 [[TMP3]], label %[[TYPECHECK:.*]], label %[[CONT1:.*]], !dbg [[DBG26]], !nosanitize [[META11]]
+// CHECK:       [[TYPECHECK]]:
+// CHECK-NEXT:    [[TMP4:%.*]] = getelementptr <{ i32, i32 }>, ptr [[TMP0]], i32 -1, i32 1, !dbg [[DBG26]], !nosanitize [[META11]]
+// CHECK-NEXT:    [[TMP5:%.*]] = load i32, ptr [[TMP4]], align 8, !dbg [[DBG26]], !nosanitize [[META11]]
+// CHECK-NEXT:    [[TMP6:%.*]] = icmp eq i32 [[TMP5]], 905068220, !dbg [[DBG26]], !nosanitize [[META11]]
+// CHECK-NEXT:    br i1 [[TMP6]], label %[[CONT:.*]], label %[[HANDLER_FUNCTION_TYPE_MISMATCH:.*]], !dbg [[DBG26]], !prof [[PROF27:![0-9]+]], !nosanitize [[META11]]
+// CHECK:       [[HANDLER_FUNCTION_TYPE_MISMATCH]]:
+// CHECK-NEXT:    [[TMP7:%.*]] = ptrtoint ptr [[TMP0]] to i64, !dbg [[DBG26]], !nosanitize [[META11]]
+// CHECK-NEXT:    call void @__ubsan_handle_function_type_mismatch_abort(ptr @[[GLOB1:[0-9]+]], i64 [[TMP7]]) #[[ATTR2:[0-9]+]], !dbg [[DBG26]], !nosanitize [[META11]]
+// CHECK-NEXT:    unreachable, !dbg [[DBG26]], !nosanitize [[META11]]
+// CHECK:       [[CONT]]:
+// CHECK-NEXT:    br label %[[CONT1]], !dbg [[DBG26]], !nosanitize [[META11]]
+// CHECK:       [[CONT1]]:
+// CHECK-NEXT:    call void [[TMP0]](), !dbg [[DBG26]]
+// CHECK-NEXT:    ret void, !dbg [[DBG28:![0-9]+]]
+//
+void call_prototype(void (*f)(void)) { f(); }
+//.
+// CHECK: [[META0:![0-9]+]] = distinct !DICompileUnit(language: DW_LANG_C11, file: [[META1:![0-9]+]], isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, splitDebugInlining: false, nameTableKind: None)
+// CHECK: [[META1]] = !DIFile(filename: "<stdin>", directory: {{.*}})
+// CHECK: [[DBG4]] = distinct !DISubprogram(name: "call_no_prototype", scope: [[META5:![0-9]+]], file: [[META5]], line: 16, type: [[META6:![0-9]+]], scopeLine: 16, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: [[META0]], retainedNodes: [[META11]])
+// CHECK: [[META5]] = !DIFile(filename: "{{.*}}ubsan-function-debuginfo.c", directory: {{.*}})
+// CHECK: [[META6]] = !DISubroutineType(types: [[META7:![0-9]+]])
+// CHECK: [[META7]] = !{null, [[META8:![0-9]+]]}
+// CHECK: [[META8]] = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: [[META9:![0-9]+]], size: 64)
+// CHECK: [[META9]] = !DISubroutineType(types: [[META10:![0-9]+]])
+// CHECK: [[META10]] = !{null, null}
+// CHECK: [[META11]] = !{}
+// CHECK: [[META12]] = !{i32 -1056584962, i32 187769638}
+// CHECK: [[META13]] = !DILocalVariable(name: "f", arg: 1, scope: [[DBG4]], file: [[META5]], line: 16, type: [[META8]])
+// CHECK: [[META14]] = !DILocation(line: 16, column: 31, scope: [[DBG4]])
+// CHECK: [[DBG15]] = !DILocation(line: 16, column: 39, scope: [[DBG4]])
+// CHECK: [[DBG16]] = !DILocation(line: 16, column: 44, scope: [[DBG4]])
+// CHECK: [[DBG17]] = distinct !DISubprogram(name: "call_prototype", scope: [[META5]], file: [[META5]], line: 43, type: [[META18:![0-9]+]], scopeLine: 43, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: [[META0]], retainedNodes: [[META11]])
+// CHECK: [[META18]] = !DISubroutineType(types: [[META19:![0-9]+]])
+// CHECK: [[META19]] = !{null, [[META20:![0-9]+]]}
+// CHECK: [[META20]] = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: [[META21:![0-9]+]], size: 64)
+// CHECK: [[META21]] = !DISubroutineType(types: [[META22:![0-9]+]])
+// CHECK: [[META22]] = !{null}
+// CHECK: [[META23]] = !{i32 -1056584962, i32 -747727454}
+// CHECK: [[META24]] = !DILocalVariable(name: "f", arg: 1, scope: [[DBG17]], file: [[META5]], line: 43, type: [[META20]])
+// CHECK: [[META25]] = !DILocation(line: 43, column: 28, scope: [[DBG17]])
+// CHECK: [[DBG26]] = !DILocation(line: 43, column: 40, scope: [[DBG17]])
+// CHECK: [[PROF27]] = !{!"branch_weights", i32 1048575, i32 1}
+// CHECK: [[DBG28]] = !DILocation(line: 43, column: 45, scope: [[DBG17]])
+//.
diff --git a/clang/test/CodeGen/unsigned-promotion-debuginfo.c b/clang/test/CodeGen/unsigned-promotion-debuginfo.c
new file mode 100644
index 0000000000000..501096b002a0c
--- /dev/null
+++ b/clang/test/CodeGen/unsigned-promotion-debuginfo.c
@@ -0,0 +1,95 @@
+// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 5
+// RUN: %clang_cc1 -triple x86_64-linux-gnu -emit-llvm -o - %s \
+// RUN:   -fdebug-prefix-map=%S/= -fno-ident -fdebug-compilation-dir=%S -debug-info-kind=limited \
+// RUN:   -fsanitize-annotate-debug-info=signed-integer-overflow \
+// RUN:   -fsanitize=signed-integer-overflow | FileCheck %s --check-prefix=CHECKS
+
+// RUN: %clang_cc1 -triple x86_64-linux-gnu -emit-llvm -o - %s \
+// RUN:   -fdebug-prefix-map=%S/= -fno-ident -fdebug-compilation-dir=%S -debug-info-kind=limited \
+// RUN:   -fsanitize-annotate-debug-info=signed-integer-overflow \
+// RUN:   -fsanitize=unsigned-integer-overflow | FileCheck %s --check-prefix=CHECKU
+
+unsigned short si, sj, sk;
+
+// CHECKS-LABEL: define dso_local void @testshortmul(
+// CHECKS-SAME: ) #[[ATTR0:[0-9]+]] !dbg [[DBG13:![0-9]+]] {
+// CHECKS-NEXT:  [[ENTRY:.*:]]
+// CHECKS-NEXT:    [[TMP0:%.*]] = load i16, ptr @sj, align 2, !dbg [[DBG16:![0-9]+]]
+// CHECKS-NEXT:    [[CONV:%.*]] = zext i16 [[TMP0]] to i32, !dbg [[DBG16]]
+// CHECKS-NEXT:    [[TMP1:%.*]] = load i16, ptr @sk, align 2, !dbg [[DBG17:![0-9]+]]
+// CHECKS-NEXT:    [[CONV1:%.*]] = zext i16 [[TMP1]] to i32, !dbg [[DBG17]]
+// CHECKS-NEXT:    [[TMP2:%.*]] = call { i32, i1 } @llvm.smul.with.overflow.i32(i32 [[CONV]], i32 [[CONV1]]), !dbg [[DBG18:![0-9]+]], !nosanitize [[META19:![0-9]+]]
+// CHECKS-NEXT:    [[TMP3:%.*]] = extractvalue { i32, i1 } [[TMP2]], 0, !dbg [[DBG18]], !nosanitize [[META19]]
+// CHECKS-NEXT:    [[TMP4:%.*]] = extractvalue { i32, i1 } [[TMP2]], 1, !dbg [[DBG18]], !nosanitize [[META19]]
+// CHECKS-NEXT:    [[TMP5:%.*]] = xor i1 [[TMP4]], true, !dbg [[DBG18]], !nosanitize [[META19]]
+// CHECKS-NEXT:    br i1 [[TMP5]], label %[[CONT:.*]], label %[[HANDLER_MUL_OVERFLOW:.*]], !dbg [[DBG18]], !prof [[PROF20:![0-9]+]], !nosanitize [[META19]]
+// CHECKS:       [[HANDLER_MUL_OVERFLOW]]:
+// CHECKS-NEXT:    [[TMP6:%.*]] = zext i32 [[CONV]] to i64, !dbg [[DBG18]], !nosanitize [[META19]]
+// CHECKS-NEXT:    [[TMP7:%.*]] = zext i32 [[CONV1]] to i64, !dbg [[DBG18]], !nosanitize [[META19]]
+// CHECKS-NEXT:    call void @__ubsan_handle_mul_overflow_abort(ptr @[[GLOB1:[0-9]+]], i64 [[TMP6]], i64 [[TMP7]]) #[[ATTR3:[0-9]+]], !dbg [[DBG18]], !nosanitize [[META19]]
+// CHECKS-NEXT:    unreachable, !dbg [[DBG18]], !nosanitize [[META19]]
+// CHECKS:       [[CONT]]:
+// CHECKS-NEXT:    [[CONV2:%.*]] = trunc i32 [[TMP3]] to i16, !dbg [[DBG16]]
+// CHECKS-NEXT:    store i16 [[CONV2]], ptr @si, align 2, !dbg [[DBG21:![0-9]+]]
+// CHECKS-NEXT:    ret void, !dbg [[DBG22:![0-9]+]]
+//
+// CHECKU-LABEL: define dso_local void @testshortmul(
+// CHECKU-SAME: ) #[[ATTR0:[0-9]+]] !dbg [[DBG13:![0-9]+]] {
+// CHECKU-NEXT:  [[ENTRY:.*:]]
+// CHECKU-NEXT:    [[TMP0:%.*]] = load i16, ptr @sj, align 2, !dbg [[DBG16:![0-9]+]]
+// CHECKU-NEXT:    [[CONV:%.*]] = zext i16 [[TMP0]] to i32, !dbg [[DBG16]]
+// CHECKU-NEXT:    [[TMP1:%.*]] = load i16, ptr @sk, align 2, !dbg [[DBG17:![0-9]+]]
+// CHECKU-NEXT:    [[CONV1:%.*]] = zext i16 [[TMP1]] to i32, !dbg [[DBG17]]
+// CHECKU-NEXT:    [[MUL:%.*]] = mul nsw i32 [[CONV]], [[CONV1]], !dbg [[DBG18:![0-9]+]]
+// CHECKU-NEXT:    [[CONV2:%.*]] = trunc i32 [[MUL]] to i16, !dbg [[DBG16]]
+// CHECKU-NEXT:    store i16 [[CONV2]], ptr @si, align 2, !dbg [[DBG19:![0-9]+]]
+// CHECKU-NEXT:    ret void, !dbg [[DBG20:![0-9]+]]
+//
+void testshortmul(void) {
+
+  //
+  si = sj * sk;
+}
+//.
+// CHECKS: [[META0:![0-9]+]] = !DIGlobalVariableExpression(var: [[META1:![0-9]+]], expr: !DIExpression())
+// CHECKS: [[META1]] = distinct !DIGlobalVariable(name: "sj", scope: [[META2:![0-9]+]], file: [[META7:![0-9]+]], line: 12, type: [[META8:![0-9]+]], isLocal: false, isDefinition: true)
+// CHECKS: [[META2]] = distinct !DICompileUnit(language: DW_LANG_C11, file: [[META3:![0-9]+]], isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, globals: [[META4:![0-9]+]], splitDebugInlining: false, nameTableKind: None)
+// CHECKS: [[META3]] = !DIFile(filename: "<stdin>", directory: {{.*}})
+// CHECKS: [[META4]] = !{[[META5:![0-9]+]], [[META0]], [[META9:![0-9]+]]}
+// CHECKS: [[META5]] = !DIGlobalVariableExpression(var: [[META6:![0-9]+]], expr: !DIExpression())
+// CHECKS: [[META6]] = distinct !DIGlobalVariable(name: "si", scope: [[META2]], file: [[META7]], line: 12, type: [[META8]], isLocal: false, isDefinition: true)
+// CHECKS: [[META7]] = !DIFile(filename: "{{.*}}unsigned-promotion-debuginfo.c", directory: {{.*}})
+// CHECKS: [[META8]] = !DIBasicType(name: "unsigned short", size: 16, encoding: DW_ATE_unsigned)
+// CHECKS: [[META9]] = !DIGlobalVariableExpression(var: [[META10:![0-9]+]], expr: !DIExpression())
+// CHECKS: [[META10]] = distinct !DIGlobalVariable(name: "sk", scope: [[META2]], file: [[META7]], line: 12, type: [[META8]], isLocal: false, isDefinition: true)
+// CHECKS: [[DBG13]] = distinct !DISubprogram(name: "testshortmul", scope: [[META7]], file: [[META7]], line: 48, type: [[META14:![0-9]+]], scopeLine: 48, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: [[META2]])
+// CHECKS: [[META14]] = !DISubroutineType(types: [[META15:![0-9]+]])
+// CHECKS: [[META15]] = !{null}
+// CHECKS: [[DBG16]] = !DILocation(line: 51, column: 8, scope: [[DBG13]])
+// CHECKS: [[DBG17]] = !DILocation(line: 51, column: 13, scope: [[DBG13]])
+// CHECKS: [[DBG18]] = !DILocation(line: 51, column: 11, scope: [[DBG13]])
+// CHECKS: [[META19]] = !{}
+// CHECKS: [[PROF20]] = !{!"branch_weights", i32 1048575, i32 1}
+// CHECKS: [[DBG21]] = !DILocation(line: 51, column: 6, scope: [[DBG13]])
+// CHECKS: [[DBG22]] = !DILocation(line: 52, column: 1, scope: [[DBG13]])
+//.
+// CHECKU: [[META0:![0-9]+]] = !DIGlobalVariableExpression(var: [[META1:![0-9]+]], expr: !DIExpression())
+// CHECKU: [[META1]] = distinct !DIGlobalVariable(name: "sj", scope: [[META2:![0-9]+]], file: [[META7:![0-9]+]], line: 12, type: [[META8:![0-9]+]], isLocal: false, isDefinition: true)
+// CHECKU: [[META2]] = distinct !DICompileUnit(language: DW_LANG_C11, file: [[META3:![0-9]+]], isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, globals: [[META4:![0-9]+]], splitDebugInlining: false, nameTableKind: None)
+// CHECKU: [[META3]] = !DIFile(filename: "<stdin>", directory: {{.*}})
+// CHECKU: [[META4]] = !{[[META5:![0-9]+]], [[META0]], [[META9:![0-9]+]]}
+// CHECKU: [[META5]] = !DIGlobalVariableExpression(var: [[META6:![0-9]+]], expr: !DIExpression())
+// CHECKU: [[META6]] = distinct !DIGlobalVariable(name: "si", scope: [[META2]], file: [[META7]], line: 12, type: [[META8]], isLocal: false, isDefinition: true)
+// CHECKU: [[META7]] = !DIFile(filename: "{{.*}}unsigned-promotion-debuginfo.c", directory: {{.*}})
+// CHECKU: [[META8]] = !DIBasicType(name: "unsigned short", size: 16, encoding: DW_ATE_unsigned)
+// CHECKU: [[META9]] = !DIGlobalVariableExpression(var: [[META10:![0-9]+]], expr: !DIExpression())
+// CHECKU: [[META10]] = distinct !DIGlobalVariable(name: "sk", scope: [[META2]], file: [[META7]], line: 12, type: [[META8]], isLocal: false, isDefinition: true)
+// CHECKU: [[DBG13]] = distinct !DISubprogram(name: "testshortmul", scope: [[META7]], file: [[META7]], line: 48, type: [[META14:![0-9]+]], scopeLine: 48, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: [[META2]])
+// CHECKU: [[META14]] = !DISubroutineType(types: [[META15:![0-9]+]])
+// CHECKU: [[META15]] = !{null}
+// CHECKU: [[DBG16]] = !DILocation(line: 51, column: 8, scope: [[DBG13]])
+// CHECKU: [[DBG17]] = !DILocation(line: 51, column: 13, scope: [[DBG13]])
+// CHECKU: [[DBG18]] = !DILocation(line: 51, column: 11, scope: [[DBG13]])
+// CHECKU: [[DBG19]] = !DILocation(line: 51, column: 6, scope: [[DBG13]])
+// CHECKU: [[DBG20]] = !DILocation(line: 52, column: 1, scope: [[DBG13]])
+//.

@@ -0,0 +1,74 @@
// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 5
// RUN: %clang_cc1 -emit-llvm -triple x86_64 -std=c17 -fsanitize=function %s -o - \
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

-O1 or -O2 to reduce the bloat?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@thurstond thurstond merged commit 9553514 into llvm:main May 28, 2025
11 checks passed
thurstond added a commit to thurstond/llvm-project that referenced this pull request May 29, 2025
This extends llvm#138577 to more
UBSan checks.

Note that the annotations are less detailed: they will always be
__ubsan_check_singularity, rather than using the SanitizerKind (previous
behavior, which is not always possible for all UBSan checks) or SanitizerHandler.
This is a (minor) regression compared to
llvm#128977 and
llvm#139809.

Updates the tests from llvm#128976,
llvm#139149 and llvm#141814.
thurstond added a commit that referenced this pull request Jun 6, 2025
This extends #138577 to more UBSan checks, by changing SanitizerDebugLocation (formerly SanitizerScope) to add annotations if enabled for the specified ordinals.

Annotations will use the ordinal name if there is exactly one ordinal specified in the SanitizerDebugLocation; otherwise, it will use the handler name.

Updates the tests from #141814.

---------

Co-authored-by: Vitaly Buka <[email protected]>
llvm-sync bot pushed a commit to arm/arm-toolchain that referenced this pull request Jun 6, 2025
…41997)

This extends llvm/llvm-project#138577 to more UBSan checks, by changing SanitizerDebugLocation (formerly SanitizerScope) to add annotations if enabled for the specified ordinals.

Annotations will use the ordinal name if there is exactly one ordinal specified in the SanitizerDebugLocation; otherwise, it will use the handler name.

Updates the tests from llvm/llvm-project#141814.

---------

Co-authored-by: Vitaly Buka <[email protected]>
tomtor pushed a commit to tomtor/llvm-project that referenced this pull request Jun 14, 2025
This extends llvm#138577 to more UBSan checks, by changing SanitizerDebugLocation (formerly SanitizerScope) to add annotations if enabled for the specified ordinals.

Annotations will use the ordinal name if there is exactly one ordinal specified in the SanitizerDebugLocation; otherwise, it will use the handler name.

Updates the tests from llvm#141814.

---------

Co-authored-by: Vitaly Buka <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

clang Clang issues not falling into any other category

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants