Merge commit 'a26095f5ba10' from swift/release/6.3 into stable/21.x

git apple-llvm automerger · git apple-llvm automerger · commit 35f48306184c · 2025-11-24T12:53:48.000-05:00
diff --git a/lldb/test/Shell/BoundsSafety/Inputs/boundsSafetySoftTrapsMissingReason.c b/lldb/test/Shell/BoundsSafety/Inputs/boundsSafetySoftTrapsMissingReason.c
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <ptrcheck.h>
 
 int bad_call(int *__counted_by(count) ptr, int count) {}
 
diff --git a/lldb/test/Shell/BoundsSafety/boundssafety_soft_trap_call_minimal_missing_reason.test b/lldb/test/Shell/BoundsSafety/boundssafety_soft_trap_call_minimal_missing_reason.test
@@ -20,7 +20,7 @@ run
 bt
 # CHECK: frame #{{.*}}`__bounds_safety_soft_trap{{$}}
 # CHECK-NEXT: frame #{{.*}}`__clang_trap_msg$Bounds check failed$
-# CHECK-NEXT: * frame #{{.*}}`main({{.+}}) at boundsSafetySoftTrapsMissingReason.c:16
+# CHECK-NEXT: * frame #{{.*}}`main({{.+}}) at boundsSafetySoftTrapsMissingReason.c:17
 
 # Resume execution
 c
diff --git a/lldb/test/Shell/BoundsSafety/boundssafety_soft_trap_call_with_str_missing_reason.test b/lldb/test/Shell/BoundsSafety/boundssafety_soft_trap_call_with_str_missing_reason.test
@@ -20,7 +20,7 @@ run
 bt
 # CHECK: frame #{{.*}}`__bounds_safety_soft_trap_s{{$}}
 # CHECK-NEXT: frame #{{.*}}`__clang_trap_msg$Bounds check failed$
-# CHECK-NEXT: * frame #{{.*}}`main({{.+}}) at boundsSafetySoftTrapsMissingReason.c:16
+# CHECK-NEXT: * frame #{{.*}}`main({{.+}}) at boundsSafetySoftTrapsMissingReason.c:17
 
 # Resume execution
 c

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ run`
`20`	`20`	`bt`
`21`	`21`	# CHECK: frame #{{.*}}`__bounds_safety_soft_trap{{$}}
`22`	`22`	# CHECK-NEXT: frame #{{.*}}`__clang_trap_msg$Bounds check failed$
`23`		-# CHECK-NEXT: * frame #{{.*}}`main({{.+}}) at boundsSafetySoftTrapsMissingReason.c:16
	`23`	+# CHECK-NEXT: * frame #{{.*}}`main({{.+}}) at boundsSafetySoftTrapsMissingReason.c:17
`24`	`24`
`25`	`25`	`# Resume execution`
`26`	`26`	`c`