[BoundsSafety] Fix tests after b247698

patrykstefanski · patrykstefanski · commit c6aeddd8b392 · 2025-09-16T07:20:45.000-07:00
b247698 makes `-Wincompatible-pointer-types` an error by default.
diff --git a/clang/test/BoundsSafety-legacy-checks/AST/ended_by_returns.c b/clang/test/BoundsSafety-legacy-checks/AST/ended_by_returns.c
@@ -1,5 +1,5 @@
-// RUN: %clang_cc1 -ast-dump -fbounds-safety %s 2> /dev/null | FileCheck %s
-// RUN: %clang_cc1 -ast-dump -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc %s 2> /dev/null | FileCheck %s
+// RUN: %clang_cc1 -ast-dump -fbounds-safety -Wno-error=incompatible-pointer-types %s 2> /dev/null | FileCheck %s
+// RUN: %clang_cc1 -ast-dump -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -Wno-error=incompatible-pointer-types %s 2> /dev/null | FileCheck %s
 
 #include <ptrcheck.h>
 
diff --git a/clang/test/BoundsSafety-legacy-checks/CodeGen/ended_by_returns.c b/clang/test/BoundsSafety-legacy-checks/CodeGen/ended_by_returns.c
@@ -1,8 +1,8 @@
 // REQUIRES: system-darwin
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --replace-value-regex "!annotation ![0-9]+" "!tbaa ![0-9]+" "!tbaa.struct ![0-9]+" "!nosanitize ![0-9]+" "!srcloc ![0-9]+" --prefix-filecheck-ir-name TMP_
 
-// RUN: %clang_cc1 -O0 -triple arm64-apple-iphoneos -fbounds-safety -emit-llvm %s -o - | FileCheck %s
-// RUN: %clang_cc1 -O0 -triple arm64-apple-iphoneos -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -O0 -triple arm64-apple-iphoneos -fbounds-safety -Wno-error=incompatible-pointer-types -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -O0 -triple arm64-apple-iphoneos -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -Wno-error=incompatible-pointer-types -emit-llvm %s -o - | FileCheck %s
 
 #include <ptrcheck.h>
 
diff --git a/clang/test/BoundsSafety-legacy-checks/CodeGen/single-null-O2.c b/clang/test/BoundsSafety-legacy-checks/CodeGen/single-null-O2.c
@@ -1,8 +1,7 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py
 
-
-// RUN: %clang_cc1 -O2 -triple x86_64 -fbounds-safety -emit-llvm %s -o - | FileCheck %s --check-prefix=CHECK-O2
-// RUN: %clang_cc1 -O2 -triple x86_64 -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -emit-llvm %s -o - | FileCheck %s --check-prefix=CHECK-O2
+// RUN: %clang_cc1 -O2 -triple x86_64 -fbounds-safety -Wno-error=incompatible-pointer-types -emit-llvm %s -o - | FileCheck %s --check-prefix=CHECK-O2
+// RUN: %clang_cc1 -O2 -triple x86_64 -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -Wno-error=incompatible-pointer-types -emit-llvm %s -o - | FileCheck %s --check-prefix=CHECK-O2
 
 #include <ptrcheck.h>
 
diff --git a/clang/test/BoundsSafety/AST/bitcast-to-counted_by.c b/clang/test/BoundsSafety/AST/bitcast-to-counted_by.c
@@ -1,7 +1,6 @@
+// RUN: %clang_cc1 -fbounds-safety -ast-dump -Wno-bounds-safety-init-list -Wno-error=incompatible-pointer-types %s | FileCheck %s
+// RUN: %clang_cc1 -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -ast-dump -Wno-bounds-safety-init-list -Wno-error=incompatible-pointer-types %s | FileCheck %s
 
-
-// RUN: %clang_cc1 -fbounds-safety -ast-dump -Wno-bounds-safety-init-list %s | FileCheck %s
-// RUN: %clang_cc1 -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -ast-dump -Wno-bounds-safety-init-list %s | FileCheck %s
 #include <ptrcheck.h>
 
 void Test(void) {
diff --git a/clang/test/BoundsSafety/AST/const-cast.c b/clang/test/BoundsSafety/AST/const-cast.c
@@ -1,12 +1,10 @@
-
-
 // RUN: %clang_cc1 -ast-dump -fbounds-safety -Wno-incompatible-pointer-types %s 2>&1 | FileCheck %s
-// RUN: %clang_cc1 -emit-llvm -fbounds-safety %s -o /dev/null
-// RUN: %clang_cc1 -emit-llvm -fbounds-safety -O2 %s -o /dev/null
+// RUN: %clang_cc1 -emit-llvm -fbounds-safety -Wno-error=incompatible-pointer-types %s -o /dev/null
+// RUN: %clang_cc1 -emit-llvm -fbounds-safety -Wno-error=incompatible-pointer-types -O2 %s -o /dev/null
 
 // RUN: %clang_cc1 -ast-dump -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -Wno-incompatible-pointer-types %s 2>&1 | FileCheck %s
-// RUN: %clang_cc1 -emit-llvm -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc %s -o /dev/null
-// RUN: %clang_cc1 -emit-llvm -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -O2 %s -o /dev/null
+// RUN: %clang_cc1 -emit-llvm -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -Wno-error=incompatible-pointer-types %s -o /dev/null
+// RUN: %clang_cc1 -emit-llvm -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -Wno-error=incompatible-pointer-types -O2 %s -o /dev/null
 
 #include <ptrcheck.h>
 
diff --git a/clang/test/BoundsSafety/AST/ended_by_assign_checks.c b/clang/test/BoundsSafety/AST/ended_by_assign_checks.c
@@ -1,5 +1,4 @@
-
-// RUN: %clang_cc1 -ast-dump -fbounds-safety %s 2> /dev/null | FileCheck %s
+// RUN: %clang_cc1 -ast-dump -fbounds-safety -Wno-error=incompatible-pointer-types %s 2> /dev/null | FileCheck %s
 
 #include <ptrcheck.h>
 
diff --git a/clang/test/BoundsSafety/AST/ended_by_returns.c b/clang/test/BoundsSafety/AST/ended_by_returns.c
@@ -1,6 +1,5 @@
-
-// RUN: %clang_cc1 -ast-dump -fbounds-safety %s 2> /dev/null | FileCheck %s
-// RUN: %clang_cc1 -ast-dump -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc %s 2> /dev/null | FileCheck %s
+// RUN: %clang_cc1 -ast-dump -fbounds-safety -Wno-error=incompatible-pointer-types %s 2> /dev/null | FileCheck %s
+// RUN: %clang_cc1 -ast-dump -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -Wno-error=incompatible-pointer-types %s 2> /dev/null | FileCheck %s
 
 #include <ptrcheck.h>
 
diff --git a/clang/test/BoundsSafety/AST/forward-declared-type.c b/clang/test/BoundsSafety/AST/forward-declared-type.c
@@ -1,7 +1,5 @@
-
-
-// RUN: %clang_cc1 -ast-dump -verify -fbounds-safety %s 2>&1 | FileCheck %s
-// RUN: %clang_cc1 -x objective-c -ast-dump -verify -fbounds-safety -fexperimental-bounds-safety-objc %s 2>&1 | FileCheck %s
+// RUN: %clang_cc1 -ast-dump -verify -fbounds-safety -Wno-error=incompatible-pointer-types %s 2>&1 | FileCheck %s
+// RUN: %clang_cc1 -x objective-c -ast-dump -verify -fbounds-safety -fexperimental-bounds-safety-objc -Wno-error=incompatible-pointer-types %s 2>&1 | FileCheck %s
 
 #include <ptrcheck.h>
 
diff --git a/clang/test/BoundsSafety/CodeGen/addr-of-struct-field.c b/clang/test/BoundsSafety/CodeGen/addr-of-struct-field.c
@@ -1,8 +1,8 @@
+// RUN: %clang_cc1 -O0 -fbounds-safety -Wno-error=incompatible-pointer-types -emit-llvm %s -o /dev/null
+// RUN: %clang_cc1 -O2 -fbounds-safety -Wno-error=incompatible-pointer-types -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -O0 -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -Wno-error=incompatible-pointer-types -emit-llvm %s -o /dev/null
+// RUN: %clang_cc1 -O2 -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -Wno-error=incompatible-pointer-types -emit-llvm %s -o - | FileCheck %s
 
-// RUN: %clang_cc1 -O0  -fbounds-safety -emit-llvm %s -o /dev/null
-// RUN: %clang_cc1 -O2  -fbounds-safety -emit-llvm %s -o - | FileCheck %s
-// RUN: %clang_cc1 -O0  -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -emit-llvm %s -o /dev/null
-// RUN: %clang_cc1 -O2  -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -emit-llvm %s -o - | FileCheck %s
 struct S {
     int i;
     char *p;
diff --git a/clang/test/BoundsSafety/CodeGen/auto-init/global-bidi-indexable-init-scalar.c b/clang/test/BoundsSafety/CodeGen/auto-init/global-bidi-indexable-init-scalar.c
@@ -1,6 +1,5 @@
-
-// RUN: %clang_cc1 -S -fbounds-safety -triple arm64-apple-darwin -O0 %s -o - | FileCheck %s
-// RUN: %clang_cc1 -S -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -triple arm64-apple-darwin -O0 %s -o - | FileCheck %s
+// RUN: %clang_cc1 -S -fbounds-safety -Wno-error=incompatible-pointer-types -triple arm64-apple-darwin -O0 %s -o - | FileCheck %s
+// RUN: %clang_cc1 -S -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -Wno-error=incompatible-pointer-types -triple arm64-apple-darwin -O0 %s -o - | FileCheck %s
 
 #include <ptrcheck.h>
 
diff --git a/clang/test/BoundsSafety/CodeGen/ended_by_returns.c b/clang/test/BoundsSafety/CodeGen/ended_by_returns.c
@@ -1,7 +1,7 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --replace-value-regex "!annotation ![0-9]+" "!tbaa ![0-9]+" "!tbaa.struct ![0-9]+" "!nosanitize ![0-9]+" "!srcloc ![0-9]+" --prefix-filecheck-ir-name TMP_ --version 5
 // REQUIRES: system-darwin
-// RUN: %clang_cc1 -O0 -triple arm64-apple-iphoneos -fbounds-safety -emit-llvm %s -o - | FileCheck %s
-// RUN: %clang_cc1 -O0 -triple arm64-apple-iphoneos -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -O0 -triple arm64-apple-iphoneos -fbounds-safety -Wno-error=incompatible-pointer-types -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -O0 -triple arm64-apple-iphoneos -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -Wno-error=incompatible-pointer-types -emit-llvm %s -o - | FileCheck %s
 
 #include <ptrcheck.h>
 
diff --git a/clang/test/BoundsSafety/CodeGen/global-init-with-array.c b/clang/test/BoundsSafety/CodeGen/global-init-with-array.c
@@ -1,7 +1,7 @@
 // REQUIRES: x86-registered-target
 
-// RUN: %clang_cc1 -triple x86_64-apple-macosx11.0.0 -O0 -fbounds-safety -S %s -o - | FileCheck %s
-// RUN: %clang_cc1 -triple x86_64-apple-macosx11.0.0 -O0 -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -S %s -o - | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64-apple-macosx11.0.0 -O0 -fbounds-safety -Wno-error=incompatible-pointer-types -S %s -o - | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64-apple-macosx11.0.0 -O0 -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -Wno-error=incompatible-pointer-types -S %s -o - | FileCheck %s
 
 #include <ptrcheck.h>
 
diff --git a/clang/test/BoundsSafety/CodeGen/init-local-struct-with-global.c b/clang/test/BoundsSafety/CodeGen/init-local-struct-with-global.c
@@ -1,7 +1,7 @@
 // REQUIRES: x86-registered-target
 
-// RUN: %clang_cc1 -triple x86_64-apple-macosx11.0.0 -O0 -fbounds-safety -S %s -o - | FileCheck %s
-// RUN: %clang_cc1 -triple x86_64-apple-macosx11.0.0 -O0 -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -S %s -o - | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64-apple-macosx11.0.0 -O0 -fbounds-safety -Wno-error=incompatible-pointer-types -S %s -o - | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64-apple-macosx11.0.0 -O0 -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -Wno-error=incompatible-pointer-types -S %s -o - | FileCheck %s
 
 #include <ptrcheck.h>
 
diff --git a/clang/test/BoundsSafety/CodeGen/init-local-struct-with-local.c b/clang/test/BoundsSafety/CodeGen/init-local-struct-with-local.c
@@ -1,9 +1,8 @@
 // REQUIRES: system-darwin
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --replace-value-regex "!annotation ![0-9]+" "!tbaa ![0-9]+" "!tbaa\.struct ![0-9]+" "!nosanitize ![0-9]+" "!srcloc ![0-9]+"
 
-
-// RUN: %clang_cc1 -triple x86_64 -O0 -fbounds-safety -emit-llvm %s -o - | FileCheck %s
-// RUN: %clang_cc1 -triple x86_64 -O0 -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64 -O0 -fbounds-safety -Wno-error=incompatible-pointer-types -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64 -O0 -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -Wno-error=incompatible-pointer-types -emit-llvm %s -o - | FileCheck %s
 
 #include <ptrcheck.h>
 
diff --git a/clang/test/BoundsSafety/CodeGen/init-local-struct-with-static-local.c b/clang/test/BoundsSafety/CodeGen/init-local-struct-with-static-local.c
@@ -1,9 +1,8 @@
 // REQUIRES: system-darwin
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --replace-value-regex "!annotation ![0-9]+" "!tbaa ![0-9]+" "!tbaa\.struct ![0-9]+" "!nosanitize ![0-9]+" "!srcloc ![0-9]+"
 
-
-// RUN: %clang_cc1 -triple x86_64 -O0 -fbounds-safety -emit-llvm %s -o - | FileCheck %s
-// RUN: %clang_cc1 -triple x86_64 -O0 -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64 -O0 -fbounds-safety -Wno-error=incompatible-pointer-types -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64 -O0 -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -Wno-error=incompatible-pointer-types -emit-llvm %s -o - | FileCheck %s
 
 #include <ptrcheck.h>
 
diff --git a/clang/test/BoundsSafety/CodeGen/init-struct-global.c b/clang/test/BoundsSafety/CodeGen/init-struct-global.c
@@ -1,7 +1,7 @@
 // REQUIRES: x86-registered-target
 
-// RUN: %clang_cc1 -triple x86_64-apple-macosx11.0.0 -O0 -fbounds-safety -S %s -o - | FileCheck %s
-// RUN: %clang_cc1 -triple x86_64-apple-macosx11.0.0 -O0 -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -S %s -o - | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64-apple-macosx11.0.0 -O0 -fbounds-safety -Wno-error=incompatible-pointer-types -S %s -o - | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64-apple-macosx11.0.0 -O0 -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -Wno-error=incompatible-pointer-types -S %s -o - | FileCheck %s
 
 #include <ptrcheck.h>
 
diff --git a/clang/test/BoundsSafety/CodeGen/init-struct-local.c b/clang/test/BoundsSafety/CodeGen/init-struct-local.c
@@ -1,7 +1,7 @@
 // REQUIRES: x86-registered-target
 
-// RUN: %clang_cc1 -triple x86_64-apple-macosx11.0.0 -O0 -fbounds-safety -S %s -o - | FileCheck %s
-// RUN: %clang_cc1 -triple x86_64-apple-macosx11.0.0 -O0 -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -S %s -o - | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64-apple-macosx11.0.0 -O0 -fbounds-safety -Wno-error=incompatible-pointer-types -S %s -o - | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64-apple-macosx11.0.0 -O0 -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -Wno-error=incompatible-pointer-types -S %s -o - | FileCheck %s
 
 #include <ptrcheck.h>
 
diff --git a/clang/test/BoundsSafety/CodeGen/runtime-checks/oob-member-expr.c b/clang/test/BoundsSafety/CodeGen/runtime-checks/oob-member-expr.c
@@ -1,10 +1,10 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 5
 // REQUIRES: system-darwin
 
-// RUN: %clang_cc1 -O2 -triple x86_64 -fbounds-safety -emit-llvm %s -o - | FileCheck --check-prefixes O2 %s
-// RUN: %clang_cc1 -O0 -triple x86_64 -fbounds-safety -emit-llvm %s -o - | FileCheck --check-prefixes O0 %s
-// RUN: %clang_cc1 -O2 -triple x86_64 -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -emit-llvm %s -o - | FileCheck --check-prefixes O2 %s
-// RUN: %clang_cc1 -O0 -triple x86_64 -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -emit-llvm %s -o - | FileCheck --check-prefixes O0 %s
+// RUN: %clang_cc1 -O2 -triple x86_64 -fbounds-safety -Wno-error=incompatible-pointer-types -emit-llvm %s -o - | FileCheck --check-prefixes O2 %s
+// RUN: %clang_cc1 -O0 -triple x86_64 -fbounds-safety -Wno-error=incompatible-pointer-types -emit-llvm %s -o - | FileCheck --check-prefixes O0 %s
+// RUN: %clang_cc1 -O2 -triple x86_64 -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -Wno-error=incompatible-pointer-types -emit-llvm %s -o - | FileCheck --check-prefixes O2 %s
+// RUN: %clang_cc1 -O0 -triple x86_64 -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -Wno-error=incompatible-pointer-types -emit-llvm %s -o - | FileCheck --check-prefixes O0 %s
 
 struct S {
     int *p;
diff --git a/clang/test/BoundsSafety/CodeGen/single-null-O2.c b/clang/test/BoundsSafety/CodeGen/single-null-O2.c
@@ -1,8 +1,7 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py
 
-
-// RUN: %clang_cc1 -O2 -triple x86_64 -fbounds-safety -emit-llvm %s -o - | FileCheck %s --check-prefix=CHECK-O2
-// RUN: %clang_cc1 -O2 -triple x86_64 -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -emit-llvm %s -o - | FileCheck %s --check-prefix=CHECK-O2
+// RUN: %clang_cc1 -O2 -triple x86_64 -fbounds-safety -Wno-error=incompatible-pointer-types -emit-llvm %s -o - | FileCheck %s --check-prefix=CHECK-O2
+// RUN: %clang_cc1 -O2 -triple x86_64 -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -Wno-error=incompatible-pointer-types -emit-llvm %s -o - | FileCheck %s --check-prefix=CHECK-O2
 
 #include <ptrcheck.h>
 
diff --git a/clang/test/BoundsSafety/Sema/address-taken-dynamic-count-decls.c b/clang/test/BoundsSafety/Sema/address-taken-dynamic-count-decls.c
@@ -1,4 +1,3 @@
-
 // RUN: %clang_cc1 -fsyntax-only -fbounds-safety -verify %s
 // RUN: %clang_cc1 -fsyntax-only -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -verify %s
 
@@ -42,11 +41,11 @@ void bar(int *fake_out_len, int **fake_out_buf) {
 
 void * baz(struct V *v) {
   int *__single ptr_to_len = &v->len; // expected-error{{cannot take address of field referred to by __counted_by on a flexible array member}}
-  int **ptr_to_buf = &v->buf;         // expected-warning{{incompatible pointer types initializing 'int *__single*__bidi_indexable' with an expression of type 'int (*__bidi_indexable)[__counted_by(len)]' (aka 'int (*__bidi_indexable)[]')}}
+  int **ptr_to_buf = &v->buf;         // expected-error{{incompatible pointer types initializing 'int *__single*__bidi_indexable' with an expression of type 'int (*__bidi_indexable)[__counted_by(len)]' (aka 'int (*__bidi_indexable)[]')}}
                                       // expected-error@-1{{cannot take address of incomplete __counted_by array}}
                                       // expected-note@-2{{remove '&' to get address as 'int *' instead of 'int (*)[__counted_by(len)]'}}
   int **ptr_ptr_to_len = &ptr_to_len;
-  ptr_to_buf = &v->buf;  // expected-warning{{incompatible pointer types assigning to 'int *__single*__bidi_indexable' from 'int (*__bidi_indexable)[__counted_by(len)]' (aka 'int (*__bidi_indexable)[]')}}
+  ptr_to_buf = &v->buf;  // expected-error{{incompatible pointer types assigning to 'int *__single*__bidi_indexable' from 'int (*__bidi_indexable)[__counted_by(len)]' (aka 'int (*__bidi_indexable)[]')}}
                          // expected-error@-1{{cannot take address of incomplete __counted_by array}}
                          // expected-note@-2{{remove '&' to get address as 'int *' instead of 'int (*)[__counted_by(len)]'}}
   *ptr_to_len = &v->len; // expected-error{{cannot take address of field referred to by __counted_by on a flexible array member}}
@@ -60,7 +59,7 @@ void * baz(struct V *v) {
   int local_len = 10;
   foo(&local_len, &v->buf); // expected-error{{incompatible dynamic count pointer argument to parameter of type}}
                             // expected-error@-1{{cannot take address of incomplete __counted_by array}}
-                            // expected-warning@-2{{incompatible pointer types passing 'int (*__bidi_indexable)[__counted_by(len)]' (aka 'int (*__bidi_indexable)[]') to parameter of type 'int *__single __counted_by(*out_len)*__single' (aka 'int *__single*__single')}}
+                            // expected-error@-2{{incompatible pointer types passing 'int (*__bidi_indexable)[__counted_by(len)]' (aka 'int (*__bidi_indexable)[]') to parameter of type 'int *__single __counted_by(*out_len)*__single' (aka 'int *__single*__single')}}
                             // expected-note@-3{{remove '&' to get address as 'int *' instead of 'int (*)[__counted_by(len)]'}}
   bar(&v->len, &v->buf); // expected-error{{cannot take address of field referred to by __counted_by on a flexible array member}}
                          // expected-error@-1{{cannot take address of incomplete __counted_by array}}
diff --git a/clang/test/BoundsSafety/Sema/array-pointer.c b/clang/test/BoundsSafety/Sema/array-pointer.c
@@ -1,4 +1,3 @@
-
 // RUN: %clang_cc1 -fsyntax-only -fbounds-safety -verify %s
 // RUN: %clang_cc1 -fsyntax-only -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -verify %s
 
@@ -13,7 +12,7 @@ int foo(void) {
 int bar(void) {
   int array[3] = {1, 2, 3};
   int *p = array;
-  // expected-warning@+1{{incompatible pointer types initializing 'int (*__bidi_indexable)[3]' with an expression of type 'int *__bidi_indexable'}}
+  // expected-error@+1{{incompatible pointer types initializing 'int (*__bidi_indexable)[3]' with an expression of type 'int *__bidi_indexable'}}
   int(*ap)[3] = p;
   return (*ap)[0];
 }
diff --git a/clang/test/BoundsSafety/Sema/count-attr-constant-initializer.c b/clang/test/BoundsSafety/Sema/count-attr-constant-initializer.c
@@ -1,4 +1,3 @@
-
 // RUN: %clang_cc1 -fsyntax-only -fbounds-safety -verify %s
 // RUN: %clang_cc1 -fsyntax-only -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -verify %s
 
@@ -24,10 +23,10 @@ struct CountInt ci2 = {.p = ints, .len = sizeof(ints) / sizeof(int) - 1};
 struct CountInt ci3 = {.p = ints, .len = sizeof(ints) / sizeof(int) + 1};
 
 // expected-error@+2{{initializing 'ci4.p' of type 'int *__single __counted_by(len)' (aka 'int *__single') and size value of 64 with array 'chars' (which has 16 bytes) always fails}}
-// expected-warning@+1{{incompatible pointer types initializing 'int *__single __counted_by(len)' (aka 'int *__single') with an expression of type 'char[16]'}}
+// expected-error@+1{{incompatible pointer types initializing 'int *__single __counted_by(len)' (aka 'int *__single') with an expression of type 'char[16]'}}
 struct CountInt ci4 = {.p = chars, .len = sizeof(chars)};
 
-// expected-warning@+1{{incompatible pointer types initializing 'int *__single __counted_by(len)' (aka 'int *__single') with an expression of type 'char[16]'}}
+// expected-error@+1{{incompatible pointer types initializing 'int *__single __counted_by(len)' (aka 'int *__single') with an expression of type 'char[16]'}}
 struct CountInt ci5 = {.p = chars, .len = sizeof(chars) / sizeof(int)};
 
 struct CountChar {
@@ -38,10 +37,10 @@ struct CountChar {
 // ok
 struct CountChar cc1 = {.p = chars, .len = sizeof(chars)};
 
-// expected-warning@+1{{incompatible pointer types initializing 'char *__single __counted_by(len)' (aka 'char *__single') with an expression of type 'int[16]'}}
+// expected-error@+1{{incompatible pointer types initializing 'char *__single __counted_by(len)' (aka 'char *__single') with an expression of type 'int[16]'}}
 struct CountChar cc2 = {.p = ints, .len = sizeof(ints) / sizeof(int)};
 
-// expected-warning@+1{{incompatible pointer types initializing 'char *__single __counted_by(len)' (aka 'char *__single') with an expression of type 'int[16]'}}
+// expected-error@+1{{incompatible pointer types initializing 'char *__single __counted_by(len)' (aka 'char *__single') with an expression of type 'int[16]'}}
 struct CountChar cc3 = {.p = ints, .len = sizeof(ints)};
 
 struct NestedCount {
diff --git a/clang/test/BoundsSafety/Sema/ct-constant-indexable-to-single.c b/clang/test/BoundsSafety/Sema/ct-constant-indexable-to-single.c
diff --git a/clang/test/BoundsSafety/Sema/dynamic-bound-calls-stress.c b/clang/test/BoundsSafety/Sema/dynamic-bound-calls-stress.c
diff --git a/clang/test/BoundsSafety/Sema/implicit-single-to-explicit-indexable-conversion-nested.c b/clang/test/BoundsSafety/Sema/implicit-single-to-explicit-indexable-conversion-nested.c
diff --git a/clang/test/BoundsSafety/Sema/implicit-single-to-explicit-indexable-conversion.c b/clang/test/BoundsSafety/Sema/implicit-single-to-explicit-indexable-conversion.c
diff --git a/clang/test/BoundsSafety/Sema/incompatible-ptr-casts-no-implicit-bound.c b/clang/test/BoundsSafety/Sema/incompatible-ptr-casts-no-implicit-bound.c
diff --git a/clang/test/BoundsSafety/Sema/incompatible-ptr-casts.c b/clang/test/BoundsSafety/Sema/incompatible-ptr-casts.c
diff --git a/clang/test/BoundsSafety/Sema/single-to-bidi-truncate.c b/clang/test/BoundsSafety/Sema/single-to-bidi-truncate.c
diff --git a/clang/test/BoundsSafety/Sema/single-unknown-size-casts.c b/clang/test/BoundsSafety/Sema/single-unknown-size-casts.c
diff --git a/clang/test/BoundsSafety/Sema/ternary-on-indexables.c b/clang/test/BoundsSafety/Sema/ternary-on-indexables.c
