[BoundsSafety] Rename experimental C++ and Objective-C flags and make them CC1 only (#10668)

The existing `-fbounds-attributes-cxx-experimental` and
`-fbounds-attributes-objc-experimental` flags were previously exposed as driver and
CC1 flags. However, given that these modes are highly experimental we
don't want to encourage their use so these flags have no been made CC1
only flags. The functionality is still available from the driver by
doing `-Xclang <flag name>`.

This patch also does a rename of the flags to be prefixed with
`experimental-` which upstream prefers.

1. `-fbounds-attributes-cxx-experimental` -> `-fexperimental-bounds-safety-cxx`
2. `-fbounds-attributes-objc-experimental` ->
  `-fexperimental-bounds-safety-objc`.

This patch also renames "bounds attributes" to "bounds safety" for
things associated with these flags (e.g.
`LangOptions::BoundsSafetyCXXExperimental`). "bounds attributes" is the
legacy name that we need to slowly purge from the codebase and this is
one small step towards that goal.

rdar://149423268
(cherry picked from commit cf995c3)

This is a cherry-pick of #10635 .

Conflicts:
  clang/test/BoundsSafety-legacy-checks/AST/SystemHeaders/builtin-function-main.c
  clang/test/BoundsSafety/AST/builtin-memcpy-count-annotation.c
  clang/test/BoundsSafety/AST/system-merge-dynamic-bound-attr.c
  clang/test/BoundsSafety/AST/typedef-function-attrs-late-parsed-call.c
  clang/test/BoundsSafety/AST/unify-auto.cpp
  clang/test/BoundsSafety/CodeGen/compound-literal-counted_by-O2.c
  clang/test/BoundsSafety/CodeGen/compound-literal-sized_by-O2.c
  clang/test/BoundsSafety/CodeGen/ended_by_locals.c
  clang/test/BoundsSafety/CodeGen/init-global-indexable-with-null.c
  clang/test/BoundsSafety/CodeGen/terminated-by-to-indexable-loop-O2.c
  clang/test/BoundsSafety/Sema/dynamic-count-ptr-null.c
  clang/test/BoundsSafety/Sema/static-bound-ptr-init.c
  clang/utils/bounds_safety_fixup_codegen_tests.sh

Author: delcypher

clang/include/clang/Basic/DiagnosticFrontendKinds.td

@@ -377,15 +377,15 @@ def err_bounds_safety_attributes_cannot_be_disabled : Error<
 def err_bounds_safety_initializer_out_of_range : Error<
   "initializing value is out of valid range">;
 
-def warn_bounds_attributes_cxx_experimental_ignored : Warning<
-  "-fbounds-attributes-cxx-experimental without -fbounds-attributes is "
+def warn_bounds_safety_cxx_experimental_ignored : Warning<
+  "-fexperimental-bounds-safety-cxx without -fbounds-safety is "
   "ignored">,
-  InGroup<BoundsAttributesCXXExperimentalIgnored>;
+  InGroup<BoundsSafetyCXXExperimentalIgnored>;
 
-def warn_bounds_attributes_objc_experimental_ignored : Warning<
-  "-fbounds-attributes-objc-experimental without -fbounds-attributes is "
+def warn_bounds_safety_objc_experimental_ignored : Warning<
+  "-fexperimental-bounds-safety-objc without -fbounds-safety is "
   "ignored">,
-  InGroup<BoundsAttributesObjCExperimentalIgnored>;
+  InGroup<BoundsSafetyObjCExperimentalIgnored>;
 
 def warn_bounds_safety_relaxed_system_headers_ignored : Warning<
   "-fno-bounds-safety-relaxed-system-headers without -fbounds-safety is "

clang/include/clang/Basic/DiagnosticGroups.td

@@ -1487,10 +1487,10 @@ def BoundsSafetyInitList : DiagGroup<"bounds-safety-init-list">;
 def BoundsAttributesExternArrayCount : DiagGroup<"bounds-attributes-extern-array-count">;
 def BoundsAttributesInitSideEffect
     : DiagGroup<"bounds-attributes-init-list-side-effect">;
-def BoundsAttributesCXXExperimentalIgnored
-    : DiagGroup<"bounds-attributes-cxx-experimental-ignored">;
-def BoundsAttributesObjCExperimentalIgnored
-    : DiagGroup<"bounds-attributes-objc-experimental-ignored">;
+def BoundsSafetyCXXExperimentalIgnored
+    : DiagGroup<"experimental-bounds-safety-cxx-ignored">;
+def BoundsSafetyObjCExperimentalIgnored
+    : DiagGroup<"experimental-bounds-safety-objc-ignored">;
 def BoundsSafetyRelaxedSystemHeadersIgnored
     : DiagGroup<"bounds-safety-relaxed-system-headers-ignore">;
 def BoundsAttributesImplicitConvSingleToExplicitIndexable :

clang/include/clang/Basic/LangOptions.def

@@ -536,8 +536,8 @@ BENIGN_LANGOPT(CheckConstexprFunctionBodies, 1, 1,
 LANGOPT(BoundsSafety, 1, 0, "Bounds safety extension for C")
 /* TO_UPSTREAM(BoundsSafety) ON*/
 LANGOPT(BoundsSafetyAttributes, 1, 0, "Experimental bounds safety attributes")
-LANGOPT(BoundsAttributesCXXExperimental, 1, 0, "Experimental bounds attributes for C++")
-LANGOPT(BoundsAttributesObjCExperimental, 1, 0, "Experimental bounds attributes for Objective-C")
+LANGOPT(BoundsSafetyCXXExperimental, 1, 0, "Experimental bounds attributes for C++")
+LANGOPT(BoundsSafetyObjCExperimental, 1, 0, "Experimental bounds attributes for Objective-C")
 LANGOPT(BoundsSafetyRelaxedSystemHeaders, 1, 1,
         "Relax bounds safety assignment rules in system headers")
 LANGOPT(BoundsSafetyBringUpMissingChecks, 7, clang::LangOptions::getDefaultBoundsSafetyNewChecksMask(),

clang/include/clang/Driver/Options.td

@@ -1971,20 +1971,20 @@ defm experimental_bounds_safety_attributes : BoolFOption<
   PosFlag<SetTrue, [], [ClangOption], "Enable">,
   NegFlag<SetFalse, [], [ClangOption], "Disable">,
   BothFlags<[], [ClangOption, CC1Option], " experimental attributes">>;
-defm bounds_attributes_cxx_experimental : BoolFOption<
-  "bounds-attributes-cxx-experimental",
-  LangOpts<"BoundsAttributesCXXExperimental">, DefaultFalse,
-  PosFlag<SetTrue, [], [ClangOption], "Enable">,
-  NegFlag<SetFalse, [], [ClangOption], "Disable">,
-  BothFlags<[], [ClangOption, CC1Option],
-          " experimental bounds attributes for C++">>;
-defm bounds_attributes_objc_experimental : BoolFOption<
-  "bounds-attributes-objc-experimental",
-  LangOpts<"BoundsAttributesObjCExperimental">, DefaultFalse,
-  PosFlag<SetTrue, [], [ClangOption], "Enable">,
-  NegFlag<SetFalse, [], [ClangOption], "Disable">,
-  BothFlags<[], [ClangOption, CC1Option],
-          " experimental bounds attributes for ObjC">>;
+defm bounds_safety_cxx_experimental : BoolFOption<
+  "experimental-bounds-safety-cxx",
+  LangOpts<"BoundsSafetyCXXExperimental">, DefaultFalse,
+  PosFlag<SetTrue, [], [CC1Option], "Enable">,
+  NegFlag<SetFalse, [], [CC1Option], "Disable">,
+  BothFlags<[], [CC1Option],
+          " experimental support for -fbounds-safety for C++">>;
+defm bounds_safety_objc_experimental : BoolFOption<
+  "experimental-bounds-safety-objc",
+  LangOpts<"BoundsSafetyObjCExperimental">, DefaultFalse,
+  PosFlag<SetTrue, [], [CC1Option], "Enable">,
+  NegFlag<SetFalse, [], [CC1Option], "Disable">,
+  BothFlags<[], [CC1Option],
+          " experimental support for -fbounds-safety for ObjC">>;
 defm bounds_safety_relaxed_system_headers : BoolFOption<
   "bounds-safety-relaxed-system-headers",
   LangOpts<"BoundsSafetyRelaxedSystemHeaders">, DefaultTrue,

clang/lib/Driver/ToolChains/Clang.cpp

@@ -7546,18 +7546,6 @@ void Clang::ConstructJob(Compilation &C, const JobAction &Job,
     CmdArgs.push_back("-fexperimental-bounds-safety-attributes");
   }
 
-  if (Args.hasFlag(options::OPT_fbounds_attributes_cxx_experimental,
-                   options::OPT_fno_bounds_attributes_cxx_experimental,
-                   false)) {
-    CmdArgs.push_back("-fbounds-attributes-cxx-experimental");
-  }
-
-  if (Args.hasFlag(options::OPT_fbounds_attributes_objc_experimental,
-                   options::OPT_fno_bounds_attributes_objc_experimental,
-                   false)) {
-    CmdArgs.push_back("-fbounds-attributes-objc-experimental");
-  }
-
   // -fbounds-safety-relaxed-system-headers is on by default
   Args.addOptOutFlag(CmdArgs,
                      options::OPT_fbounds_safety_relaxed_system_headers,

clang/lib/Frontend/CompilerInvocation.cpp

@@ -4429,10 +4429,10 @@ bool CompilerInvocation::ParseLangArgs(LangOptions &Opts, ArgList &Args,
       SupportsBoundsSafety = true;
       break;
     case Language::ObjC:
-      SupportsBoundsSafety = Opts.BoundsAttributesObjCExperimental;
+      SupportsBoundsSafety = Opts.BoundsSafetyObjCExperimental;
       break;
     case Language::CXX:
-      SupportsBoundsSafety = Opts.BoundsAttributesCXXExperimental;
+      SupportsBoundsSafety = Opts.BoundsSafetyCXXExperimental;
       break;
     default:
       break;
@@ -4459,11 +4459,11 @@ bool CompilerInvocation::ParseLangArgs(LangOptions &Opts, ArgList &Args,
     Opts.ExperimentalLateParseAttributes = 1;
   }
 
-  if (Opts.BoundsAttributesCXXExperimental && !Opts.BoundsSafety)
-    Diags.Report(diag::warn_bounds_attributes_cxx_experimental_ignored);
+  if (Opts.BoundsSafetyCXXExperimental && !Opts.BoundsSafety)
+    Diags.Report(diag::warn_bounds_safety_cxx_experimental_ignored);
 
-  if (Opts.BoundsAttributesObjCExperimental && !Opts.BoundsSafety)
-    Diags.Report(diag::warn_bounds_attributes_objc_experimental_ignored);
+  if (Opts.BoundsSafetyObjCExperimental && !Opts.BoundsSafety)
+    Diags.Report(diag::warn_bounds_safety_objc_experimental_ignored);
 
   if (!Opts.BoundsSafetyRelaxedSystemHeaders && !Opts.BoundsSafety)
     Diags.Report(diag::warn_bounds_safety_relaxed_system_headers_ignored);

clang/test/BoundsSafety-legacy-checks/AST/SystemHeaders/builtin-function-main.c

@@ -2,7 +2,7 @@
 #include <builtin-function-sys.h>
 
 // RUN: %clang_cc1 -ast-dump -fbounds-safety %s -I %S/../../../BoundsSafety/AST/SystemHeaders/include | FileCheck %s --implicit-check-not "GetBoundExpr {{.+}} 'char *__single'" --implicit-check-not "GetBoundExpr {{.+}} 'char *'"
-// RUN: %clang_cc1 -ast-dump -fbounds-safety %s -I %S/../../../BoundsSafety/AST/SystemHeaders/include -x objective-c -fbounds-attributes-objc-experimental | FileCheck %s --implicit-check-not "GetBoundExpr {{.+}} 'char *__single'" --implicit-check-not "GetBoundExpr {{.+}} 'char *'"
+// RUN: %clang_cc1 -ast-dump -fbounds-safety %s -I %S/../../../BoundsSafety/AST/SystemHeaders/include -x objective-c -fexperimental-bounds-safety-objc | FileCheck %s --implicit-check-not "GetBoundExpr {{.+}} 'char *__single'" --implicit-check-not "GetBoundExpr {{.+}} 'char *'"
 
 char * __counted_by(len) func(char * __counted_by(len) src_str, int len) {
   int len2 = 0;

clang/test/BoundsSafety-legacy-checks/AST/bounds-attributed-in-return-disabled.c

@@ -2,7 +2,7 @@
 
 
 // RUN: %clang_cc1 -fbounds-safety -ast-dump %s 2>&1 | FileCheck %s
-// RUN: %clang_cc1 -fbounds-safety -x objective-c -fbounds-attributes-objc-experimental -ast-dump %s 2>&1 | FileCheck %s
+// RUN: %clang_cc1 -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -ast-dump %s 2>&1 | FileCheck %s
 
 #include <ptrcheck.h>
 

clang/test/BoundsSafety-legacy-checks/AST/count-attrs.c

@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -triple x86_64-apple-mac -ast-dump -fbounds-safety %s | FileCheck %s
-// RUN: %clang_cc1 -triple x86_64-apple-mac -ast-dump -fbounds-safety -x objective-c -fbounds-attributes-objc-experimental %s | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64-apple-mac -ast-dump -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc %s | FileCheck %s
 #include <ptrcheck.h>
 
 int *__counted_by(len) frob(int len);

clang/test/BoundsSafety-legacy-checks/AST/counted_by_or_null_call.c

@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -ast-dump -fbounds-safety -Wno-bounds-safety-init-list %s | FileCheck %s
-// RUN: %clang_cc1 -ast-dump -fbounds-safety -x objective-c -fbounds-attributes-objc-experimental -Wno-bounds-safety-init-list %s | FileCheck %s
+// RUN: %clang_cc1 -ast-dump -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -Wno-bounds-safety-init-list %s | FileCheck %s
 
 #include <ptrcheck.h>
 

clang/test/BoundsSafety-legacy-checks/AST/ended_by_const_param.c

@@ -1,7 +1,7 @@
 // FileCheck lines automatically generated using make-ast-dump-check-v2.py
 
 // RUN: %clang_cc1 -triple x86_64-apple-mac -ast-dump -fbounds-safety %s 2>&1 | FileCheck %s
-// RUN: %clang_cc1 -triple x86_64-apple-mac -ast-dump -fbounds-safety -x objective-c -fbounds-attributes-objc-experimental %s 2>&1 | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64-apple-mac -ast-dump -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc %s 2>&1 | FileCheck %s
 #include <ptrcheck.h>
 
 struct S {

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 -fbounds-attributes-objc-experimental %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
 
 #include <ptrcheck.h>
 

clang/test/BoundsSafety-legacy-checks/AST/sized_by_or_null_call.c

@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -ast-dump -fbounds-safety -Wno-bounds-safety-init-list %s | FileCheck %s
-// RUN: %clang_cc1 -ast-dump -fbounds-safety -x objective-c -fbounds-attributes-objc-experimental -Wno-bounds-safety-init-list %s | FileCheck %s
+// RUN: %clang_cc1 -ast-dump -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -Wno-bounds-safety-init-list %s | FileCheck %s
 
 #include <ptrcheck.h>
 

clang/test/BoundsSafety-legacy-checks/AST/unify-function-types.c

@@ -1,6 +1,6 @@
 
 // RUN: %clang_cc1 -ast-dump -fbounds-safety -verify=c %s | FileCheck %s
-// RUN: %clang_cc1 -x c++ -ast-dump -fbounds-safety -fbounds-attributes-cxx-experimental -verify=cpp %s
+// RUN: %clang_cc1 -x c++ -ast-dump -fbounds-safety -fexperimental-bounds-safety-cxx -verify=cpp %s
 #include <ptrcheck.h>
 
 char funcA(char buf[__counted_by(len)], int len, int len2);

clang/test/BoundsSafety-legacy-checks/AST/value-dependence.cpp

@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -fexperimental-bounds-safety-attributes -ast-dump %s 2>&1 | FileCheck %s --check-prefix=ATTR-ONLY
-// RUN: %clang_cc1 -fbounds-safety -fbounds-attributes-cxx-experimental -DBOUNDS_SAFETY -ast-dump %s 2>&1 | FileCheck %s --check-prefix=BOUNDS-CHECK
+// RUN: %clang_cc1 -fbounds-safety -fexperimental-bounds-safety-cxx -DBOUNDS_SAFETY -ast-dump %s 2>&1 | FileCheck %s --check-prefix=BOUNDS-CHECK
 
 #include <ptrcheck.h>
 

clang/test/BoundsSafety-legacy-checks/CodeGen/addr-of-array-elem-O2.c

@@ -1,6 +1,6 @@
 // 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 -O2  -fbounds-safety -triple arm64-apple-iphoneos -emit-llvm %s -o - | FileCheck %s
-// RUN: %clang_cc1 -O2  -fbounds-safety -triple arm64-apple-iphoneos -x objective-c -fbounds-attributes-objc-experimental -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -O2  -fbounds-safety -triple arm64-apple-iphoneos -x objective-c -fexperimental-bounds-safety-objc -emit-llvm %s -o - | FileCheck %s
 
 int arr[10];
 

clang/test/BoundsSafety-legacy-checks/CodeGen/addr-of-array-elem.c

@@ -1,6 +1,6 @@
 // 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 -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 -fbounds-attributes-objc-experimental -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
 
 int arr[10];
 

clang/test/BoundsSafety-legacy-checks/CodeGen/addr-of-packed-struct.c

@@ -1,8 +1,8 @@
 // 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 -O0 -fbounds-safety -triple arm64-apple-iphoneos -emit-llvm %s -o /dev/null
 // RUN: %clang_cc1 -O2 -fbounds-safety -triple arm64-apple-iphoneos -emit-llvm %s -o - | FileCheck %s
-// RUN: %clang_cc1 -O0 -fbounds-safety -triple arm64-apple-iphoneos -x objective-c -fbounds-attributes-objc-experimental -emit-llvm %s -o /dev/null
-// RUN: %clang_cc1 -O2 -fbounds-safety -triple arm64-apple-iphoneos -x objective-c -fbounds-attributes-objc-experimental -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -O0 -fbounds-safety -triple arm64-apple-iphoneos -x objective-c -fexperimental-bounds-safety-objc -emit-llvm %s -o /dev/null
+// RUN: %clang_cc1 -O2 -fbounds-safety -triple arm64-apple-iphoneos -x objective-c -fexperimental-bounds-safety-objc -emit-llvm %s -o - | FileCheck %s
 
 struct __attribute__((packed)) foo {
 	char x; // field 0

clang/test/BoundsSafety-legacy-checks/CodeGen/addrof-member-to-single-O2.c

@@ -1,6 +1,6 @@
 // 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 -O2 -fbounds-safety -emit-llvm -triple arm64e-apple-iphoneos %s -o - | FileCheck %s
-// RUN: %clang_cc1 -O2 -fbounds-safety -x objective-c -fbounds-attributes-objc-experimental -emit-llvm -triple arm64e-apple-iphoneos %s -o - | FileCheck %s
+// RUN: %clang_cc1 -O2 -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -emit-llvm -triple arm64e-apple-iphoneos %s -o - | FileCheck %s
 
 #include <ptrcheck.h>
 

clang/test/BoundsSafety-legacy-checks/CodeGen/alloc-sized-calloc/alloc-sized-calloc.c

@@ -2,7 +2,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_
 
 // RUN: %clang_cc1 -emit-llvm -triple arm64e -fbounds-safety %s -o - | FileCheck %s
-// RUN: %clang_cc1 -emit-llvm -triple arm64e -fbounds-safety -x objective-c -fbounds-attributes-objc-experimental %s -o - | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm -triple arm64e -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc %s -o - | FileCheck %s
 
 #include <ptrcheck.h>
 #include "mock-header.h"

clang/test/BoundsSafety-legacy-checks/CodeGen/array-bound-deref-addrof.c

@@ -2,8 +2,8 @@
 
 // RUN: %clang_cc1 -O0 -triple arm64-apple-iphoneos -fbounds-safety -emit-llvm %s -o - | FileCheck %s --check-prefix=CHECK-O0
 // RUN: %clang_cc1 -O2 -triple arm64-apple-iphoneos -fbounds-safety -emit-llvm %s -o - | FileCheck %s --check-prefix=CHECK-O2
-// RUN: %clang_cc1 -O0 -triple arm64-apple-iphoneos -fbounds-safety -x objective-c -fbounds-attributes-objc-experimental -emit-llvm %s -o - | FileCheck %s --check-prefix=CHECK-O0
-// RUN: %clang_cc1 -O2 -triple arm64-apple-iphoneos -fbounds-safety -x objective-c -fbounds-attributes-objc-experimental -emit-llvm %s -o - | FileCheck %s --check-prefix=CHECK-O2
+// RUN: %clang_cc1 -O0 -triple arm64-apple-iphoneos -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -emit-llvm %s -o - | FileCheck %s --check-prefix=CHECK-O0
+// RUN: %clang_cc1 -O2 -triple arm64-apple-iphoneos -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -emit-llvm %s -o - | FileCheck %s --check-prefix=CHECK-O2
 #include <ptrcheck.h>
 
 // CHECK-O0-LABEL: @foo(

clang/test/BoundsSafety-legacy-checks/CodeGen/array-decay.c

@@ -1,8 +1,8 @@
 // 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 -O0 -triple arm64-apple-iphoneos -fbounds-safety -emit-llvm %s -o - | FileCheck %s --check-prefix=CHECK-O0
 // RUN: %clang_cc1 -O2 -triple arm64-apple-iphoneos -fbounds-safety -emit-llvm %s -o - | FileCheck %s --check-prefix=CHECK-O2
-// RUN: %clang_cc1 -O0 -triple arm64-apple-iphoneos -fbounds-safety -x objective-c -fbounds-attributes-objc-experimental -emit-llvm %s -o - | FileCheck %s --check-prefix=CHECK-O0
-// RUN: %clang_cc1 -O2 -triple arm64-apple-iphoneos -fbounds-safety -x objective-c -fbounds-attributes-objc-experimental -emit-llvm %s -o - | FileCheck %s --check-prefix=CHECK-O2
+// RUN: %clang_cc1 -O0 -triple arm64-apple-iphoneos -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -emit-llvm %s -o - | FileCheck %s --check-prefix=CHECK-O0
+// RUN: %clang_cc1 -O2 -triple arm64-apple-iphoneos -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -emit-llvm %s -o - | FileCheck %s --check-prefix=CHECK-O2
 
 // CHECK-O0-LABEL: @foo(
 // CHECK-O0:  {{.*}}:

clang/test/BoundsSafety-legacy-checks/CodeGen/const-bound-ptr-conversion.c

@@ -2,8 +2,8 @@
 
 // RUN: %clang_cc1 -O0 -triple x86_64 -fbounds-safety -emit-llvm %s -o - | FileCheck %s --check-prefix=CHECK_O0
 // RUN: %clang_cc1 -O2 -triple x86_64 -fbounds-safety -emit-llvm %s -o - | FileCheck %s --check-prefix=CHECK_O2
-// RUN: %clang_cc1 -O0 -triple x86_64 -fbounds-safety -x objective-c -fbounds-attributes-objc-experimental -emit-llvm %s -o - | FileCheck %s --check-prefix=CHECK_O0
-// RUN: %clang_cc1 -O2 -triple x86_64 -fbounds-safety -x objective-c -fbounds-attributes-objc-experimental -emit-llvm %s -o - | FileCheck %s --check-prefix=CHECK_O2
+// RUN: %clang_cc1 -O0 -triple x86_64 -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -emit-llvm %s -o - | FileCheck %s --check-prefix=CHECK_O0
+// 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
 // CHECK_O0-LABEL: @foo(
 // CHECK_O0:  {{.*}}:
 // CHECK_O0:    [[ARRAY:%.*]] = alloca [10 x i32], align 16

clang/test/BoundsSafety-legacy-checks/CodeGen/constant-eval-count-static-init.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_
 
 // RUN: %clang_cc1 -triple x86_64 -fbounds-safety -emit-llvm %s -o - | FileCheck %s
-// RUN: %clang_cc1 -triple x86_64 -fbounds-safety -x objective-c -fbounds-attributes-objc-experimental -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64 -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -emit-llvm %s -o - | FileCheck %s
 #include <ptrcheck.h>
 
 typedef struct {

clang/test/BoundsSafety-legacy-checks/CodeGen/count-return.c

@@ -2,8 +2,8 @@
 
 // RUN: %clang_cc1 -O0 -triple x86_64 -fbounds-safety -emit-llvm %s -o - | FileCheck %s --check-prefix=CHECK-O0
 // RUN: %clang_cc1 -O2 -triple x86_64 -fbounds-safety -emit-llvm %s -o - | FileCheck %s --check-prefix=CHECK-O2
-// RUN: %clang_cc1 -O0 -triple x86_64 -fbounds-safety -x objective-c -fbounds-attributes-objc-experimental -emit-llvm %s -o - | FileCheck %s --check-prefix=CHECK-O0
-// RUN: %clang_cc1 -O2 -triple x86_64 -fbounds-safety -x objective-c -fbounds-attributes-objc-experimental -emit-llvm %s -o - | FileCheck %s --check-prefix=CHECK-O2
+// RUN: %clang_cc1 -O0 -triple x86_64 -fbounds-safety -x objective-c -fexperimental-bounds-safety-objc -emit-llvm %s -o - | FileCheck %s --check-prefix=CHECK-O0
+// 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
 #include <ptrcheck.h>
 
 int *__sized_by(len) alloc(int len);