Merge branch 'swift/release/6.2' into stop-hooks-initial-stop

Author: jimingham

clang/docs/ReleaseNotes.rst

@@ -451,6 +451,11 @@ Non-comprehensive list of changes in this release
   removed in Clang 20. ``__is_same(__remove_cv(T), decltype(nullptr))`` can be
   used instead to check whether a type ``T`` is a ``nullptr``.
 
+- Clang itself now uses split stacks instead of threads for allocating more
+  stack space when running on Apple AArch64 based platforms. This means that
+  stack traces of Clang from debuggers, crashes, and profilers may look
+  different than before.
+
 New Compiler Flags
 ------------------
 - ``-fsanitize=implicit-bitfield-conversion`` checks implicit truncation and

clang/include/clang/AST/DeclBase.h

@@ -771,7 +771,7 @@ class alignas(8) Decl {
   /// 'weak_import' attribute, but may also be marked with an
   /// 'availability' attribute where we're targing a platform prior to
   /// the introduction of this feature.
-  bool isWeakImported() const;
+  bool isWeakImported(VersionTuple EnclosingVersion = VersionTuple()) const;
 
   /// Determines whether this symbol can be weak-imported,
   /// e.g., whether it would be well-formed to add the weak_import

clang/include/clang/Basic/DiagnosticCASKinds.td

@@ -23,8 +23,10 @@ def err_cas_depscan_daemon_connection: Error<
 def err_cas_depscan_failed: Error<
   "CAS-based dependency scan failed: %0">, DefaultFatal;
 def err_cas_store: Error<"failed to store to CAS: %0">, DefaultFatal;
-def err_cas_cannot_get_module_cache_key : Error<
-  "CAS cannot load module with key '%0' from %1: %2">, DefaultFatal;
+def err_cas_unloadable_module : Error<
+  "module file '%0' not found: unloadable module cache key %1: %2">, DefaultFatal;
+def err_cas_missing_module : Error<
+  "module file '%0' not found: missing module cache key %1: %2">, DefaultFatal;
 def err_cas_missing_root_id : Error<
   "CAS missing expected root-id '%0'">, DefaultFatal;
 def err_cas_cannot_parse_root_id_for_module : Error<

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/Basic/Stack.h

@@ -27,7 +27,10 @@ namespace clang {
 
   /// Call this once on each thread, as soon after starting the thread as
   /// feasible, to note the approximate address of the bottom of the stack.
-  void noteBottomOfStack();
+  ///
+  /// \param ForceSet set to true if you know the call is near the bottom of a
+  ///                 new stack. Used for split stacks.
+  void noteBottomOfStack(bool ForceSet = false);
 
   /// Determine whether the stack is nearly exhausted.
   bool isStackNearlyExhausted();

clang/include/clang/CAS/CASOptions.h

@@ -117,6 +117,8 @@ class CASOptions : public CASConfiguration {
   /// default on-disk CAS, otherwise this is a noop.
   void ensurePersistentCAS();
 
+  void getResolvedCASPath(llvm::SmallVectorImpl<char> &Result) const;
+
 private:
   /// Initialize Cached CAS and ActionCache.
   llvm::Error initCache() const;

clang/include/clang/CAS/IncludeTree.h

@@ -313,7 +313,7 @@ class IncludeTree::FileList : public IncludeTreeBase<FileList> {
   FileSizeTy getFileSize(size_t I) const;
 
   llvm::Error
-  forEachFileImpl(llvm::DenseSet<ObjectRef> &Seen,
+  forEachFileImpl(llvm::DenseMap<ObjectRef, ObjectRef> &Seen,
                   llvm::function_ref<llvm::Error(File, FileSizeTy)> Callback);
 
   static bool isValid(const ObjectProxy &Node);
@@ -864,16 +864,16 @@ class IncludeTreeRoot : public IncludeTreeBase<IncludeTreeRoot> {
 
 /// An implementation of a \p vfs::FileSystem that supports the simple queries
 /// of the preprocessor, for creating \p FileEntries using a file path, while
-/// "replaying" an \p IncludeTreeRoot. It is not intended to be a complete
+/// "replaying" an \p IncludeTree::FileList. It is not intended to be a complete
 /// implementation of a file system.
 Expected<IntrusiveRefCntPtr<llvm::vfs::FileSystem>>
-createIncludeTreeFileSystem(IncludeTreeRoot &Root);
+createIncludeTreeFileSystem(IncludeTree::FileList &List);
 
 /// Create the same IncludeTreeFileSystem but from
 /// ArrayRef<IncludeTree::FileEntry>.
 Expected<IntrusiveRefCntPtr<llvm::vfs::FileSystem>> createIncludeTreeFileSystem(
     llvm::cas::ObjectStore &CAS,
-    llvm::ArrayRef<IncludeTree::FileList::FileEntry> List);
+    llvm::ArrayRef<IncludeTree::FileList::FileEntry> Files);
 
 } // namespace cas
 } // namespace clang

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,
@@ -8221,6 +8221,11 @@ def objc_isystem : Separate<["-"], "objc-isystem">,
 def objcxx_isystem : Separate<["-"], "objcxx-isystem">,
   MetaVarName<"<directory>">,
   HelpText<"Add directory to the ObjC++ SYSTEM include search path">;
+def internal_iframework : Separate<["-"], "internal-iframework">,
+  MetaVarName<"<directory>">,
+  HelpText<"Add directory to the internal system framework search path; these "
+           "are assumed to not be user-provided and are used to model system "
+           "and standard frameworks' paths.">;
 def internal_isystem : Separate<["-"], "internal-isystem">,
   MetaVarName<"<directory>">,
   HelpText<"Add directory to the internal system include search path; these "