Merge commit 'f3274059e0a1' from swift/release/6.2 into stable/20240723

Author: git apple-llvm automerger

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

@@ -4433,10 +4433,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;
@@ -4463,11 +4463,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>