Skip to content

[BoundsSafety] Fix tests broken by change to how debug info in macros is handled #11739

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
Nov 4, 2025
Merged

[BoundsSafety] Fix tests broken by change to how debug info in macros is handled #11739

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
6 changes: 3 additions & 3 deletions clang/test/BoundsSafety/CodeGen/opt-remarks/bounds-safety-ptr-conversion-O0.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ int main(int argc, char **argv) {
// IR: store ptr %argv, ptr %[[ARGV_ALLOCA:[a-z0-9.]+]]
// IR: %[[ARGV:[a-z0-9.]+]] = load ptr, ptr %[[ARGV_ALLOCA]]{{.*}}
// IR: %[[ARGV_DEREF:[a-z0-9.]+]] = load ptr, ptr %[[ARGV]]{{.*}}
// IR: %[[LEN_DEREF:[a-z0-9.]+]] = load i32, ptr %{{.*}}, !dbg ![[LOC_11_20:[0-9]+]]
// IR: %[[LEN_EXT:[a-z0-9.]+]] = sext i32 %[[LEN_DEREF]] to i64, !dbg ![[LOC_11_20]]
// IR: %[[LEN_DEREF:[a-z0-9.]+]] = load i32, ptr %{{.*}}, !dbg ![[LOC_11_33:[0-9]+]]
// IR: %[[LEN_EXT:[a-z0-9.]+]] = sext i32 %[[LEN_DEREF]] to i64, !dbg ![[LOC_11_33]]
// IR: icmp ule ptr %[[ARGV_DEREF]], {{.*}}, !dbg ![[LOC_11_37:[0-9]+]]
// IR: br i1 {{.*}}, label %[[LABEL_CONT:[a-z0-9.]+]], label %[[LABEL_TRAP_RES:[a-z0-9.]+]], !dbg ![[LOC_11_37]]
// ...
Expand Down Expand Up @@ -70,7 +70,7 @@ int main(int argc, char **argv) {
// IR-DAG: ![[TRAP_LOC_11_44]] = !DILocation(line: 0, scope: ![[TRAP_INFO_11_44:[0-9]+]], inlinedAt: ![[LOC_11_44]])
// IR-DAG: ![[TRAP_INFO_11_44]] = distinct !DISubprogram(name: "__clang_trap_msg$Bounds check failed$"
//
// IR-DAG: ![[LOC_11_20]] = !DILocation(line: 11, column: 20
// IR-DAG: ![[LOC_11_33]] = !DILocation(line: 11, column: 33

// IR-DAG: ![[TRAP_LOC_MISSING]] = !DILocation(line: 0, scope: ![[MAIN_SCOPE:[0-9]+]])
// IR-DAG: ![[MAIN_SCOPE]] = distinct !DISubprogram(name: "main", {{.*}} line: 9, {{.*}} scopeLine: 9
Expand Down
2 changes: 1 addition & 1 deletion clang/test/BoundsSafety/CodeGen/opt-remarks/ptr-count-assignment-argc-O0.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ int main(int argc, char **argv) {
// OPT-REM-NEXT: Pass: annotation-remarks
// OPT-REM-NEXT: Name: BoundsSafetyCheck
// OPT-REM-NEXT: DebugLoc: { File: '{{.*}}ptr-count-assignment-argc-O0.c',
// OPT-REM-NEXT: Line: 11, Column: 11 }
// OPT-REM-NEXT: Line: 11, Column: 24 }
// OPT-REM-NEXT: Function: main
// OPT-REM-NEXT: Args:
// OPT-REM-NEXT: - String: 'Inserted '
Expand Down
2 changes: 1 addition & 1 deletion clang/test/BoundsSafety/CodeGen/opt-remarks/ptr-count-assignment-const-O0.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ int main(void) {
// OPT-REM-NEXT: Pass: annotation-remarks
// OPT-REM-NEXT: Name: BoundsSafetyCheck
// OPT-REM-NEXT: DebugLoc: { File: '{{.*}}ptr-count-assignment-const-O0.c',
// OPT-REM-NEXT: Line: 11, Column: 11 }
// OPT-REM-NEXT: Line: 11, Column: 24 }
// OPT-REM-NEXT: Function: main
// OPT-REM-NEXT: Args:
// OPT-REM-NEXT: - String: 'Inserted '
Expand Down
2 changes: 1 addition & 1 deletion clang/test/BoundsSafety/CodeGen/trap-reasons/ptr_ge_upper_bound-deref-array_subscript-O0.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ int operation(int index) {

// CHECK-DAG: [[TRAP_LOC:![0-9]+]] = !DILocation(line: 0, scope: [[TRAP_SCOPE]], inlinedAt: [[SRC_LOC:![0-9]+]])
// PLAIN-DAG: [[SRC_LOC]] = !DILocation(line: 49, column: 10, scope: {{![0-9]+}})
// MACRO-DAG: [[SRC_LOC]] = !DILocation(line: 51, column: 10, scope: {{![0-9]+}})
// MACRO-DAG: [[SRC_LOC]] = !DILocation(line: 51, column: 16, scope: {{![0-9]+}})

// In the detailed mode the address space overflow gets its own trap reason.
// FIXME: Basic mode should probably be making this distinction too.
Expand Down
2 changes: 1 addition & 1 deletion clang/test/BoundsSafety/CodeGen/trap-reasons/ptr_lt_lower_bound-deref-array_subscript-O0.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ int operation(int index) {
// DETAILED-DAG: [[TRAP_SCOPE]] = distinct !DISubprogram(name: "__clang_trap_msg$Bounds check failed$indexing below lower bound in 'array[index]'", scope: [[FILE_SCOPE:![0-9]+]], file: [[FILE_SCOPE]], type: {{.+}}, flags: DIFlagArtificial, spFlags: DISPFlagDefinition, unit: {{![0-9]+}}

// PLAIN-DAG: [[LOC]] = !DILocation(line: 32, column: 10, scope: {{![0-9]+}})
// MACRO-DAG: [[LOC]] = !DILocation(line: 34, column: 10, scope: {{![0-9]+}})
// MACRO-DAG: [[LOC]] = !DILocation(line: 34, column: 16, scope: {{![0-9]+}})