Merge pull request #81334 from gottesmm/release/6.2-rdar150695113

[6.2][swift-settings] Now that we aren't using it immediately, remove it from tree.

Author: gottesmm

Runtimes/Core/core/CMakeLists.txt

@@ -188,7 +188,6 @@ add_library(swiftCore
   StringWordBreaking.swift
   Substring.swift
   SwiftNativeNSArray.swift
-  SwiftSettings.swift
   TemporaryAllocation.swift
   ThreadLocalStorage.swift
   UIntBuffer.swift

include/swift/AST/ASTBridging.h

@@ -3049,8 +3049,6 @@ enum ENUM_EXTENSIBILITY_ATTR(open) BridgedMacroDefinitionKind : size_t {
   BridgedBuiltinExternalMacro,
   /// The builtin definition for the "isolation" macro.
   BridgedBuiltinIsolationMacro,
-  /// The builtin definition for the "SwiftSetting" macro.
-  BridgedBuiltinSwiftSettingsMacro,
 };
 
 struct BridgedASTType {

include/swift/AST/DiagnosticsSema.def

@@ -8650,20 +8650,5 @@ GROUPED_WARNING(
     "behavior",
     (StringRef, DeclAttribute))
 
-//===----------------------------------------------------------------------===//
-//                            MARK: SwiftSettings
-//===----------------------------------------------------------------------===//
-
-ERROR(swift_settings_invalid_setting, none,
-      "Unrecognized setting passed to #SwiftSettings", ())
-
-ERROR(swift_settings_must_be_top_level, none,
-      "#SwiftSettings can only be invoked as a top level declaration", ())
-
-ERROR(swift_settings_duplicate_setting, none,
-      "duplicate setting passed to #SwiftSettings", ())
-NOTE(swift_settings_duplicate_setting_original_loc, none,
-     "setting originally passed here", ())
-
 #define UNDEFINE_DIAGNOSTIC_MACROS
 #include "DefineDiagnosticMacros.h"

include/swift/AST/KnownStdlibTypes.def

@@ -101,8 +101,6 @@ KNOWN_STDLIB_TYPE_DECL(Result, NominalTypeDecl, 2)
 
 KNOWN_STDLIB_TYPE_DECL(InlineArray, NominalTypeDecl, 2)
 
-KNOWN_STDLIB_TYPE_DECL(SwiftSetting, NominalTypeDecl, 0)
-
 KNOWN_STDLIB_TYPE_DECL(MutableSpan, NominalTypeDecl, 1)
 
 #undef KNOWN_STDLIB_TYPE_DECL

include/swift/AST/MacroDefinition.h

@@ -77,9 +77,6 @@ enum class BuiltinMacroKind : uint8_t {
   ExternalMacro,
   /// #isolation, which produces the isolation of the current context
   IsolationMacro,
-  /// #SwiftSettings, which allows for the user to set a compiler setting at
-  /// the file level
-  SwiftSettingsMacro,
 };
 
 /// A single replacement

include/swift/AST/SourceFile.h

@@ -53,15 +53,6 @@ enum class RestrictedImportKind {
 /// Import that limits the access level of imported entities.
 using ImportAccessLevel = std::optional<AttributedImport<ImportedModule>>;
 
-/// Language options only for use with a specific SourceFile.
-///
-/// Vended by SourceFile::getLanguageOptions().
-struct SourceFileLangOptions {
-  /// If unset, no value was provided. If a Type, that type is the type of the
-  /// isolation. If set to an empty type, nil was specified explicitly.
-  std::optional<Type> defaultIsolation;
-};
-
 /// A file containing Swift source code.
 ///
 /// This is a .swift or .sil file (or a virtual file, such as the contents of
@@ -571,9 +562,6 @@ class SourceFile final : public FileUnit {
          ObjCSelector selector,
          SmallVectorImpl<AbstractFunctionDecl *> &results) const override;
 
-  /// File level language options.
-  SourceFileLangOptions getLanguageOptions() const;
-
 protected:
   virtual void
   lookupOperatorDirect(Identifier name, OperatorFixity fixity,

include/swift/AST/TypeCheckRequests.h

@@ -5313,26 +5313,6 @@ class SemanticAvailabilitySpecRequest
   void cacheResult(std::optional<SemanticAvailabilitySpec> value) const;
 };
 
-class SourceFileLangOptionsRequest
-    : public SimpleRequest<SourceFileLangOptionsRequest,
-                           SourceFileLangOptions(SourceFile *),
-                           RequestFlags::Cached> {
-
-public:
-  using SimpleRequest::SimpleRequest;
-
-private:
-  friend SimpleRequest;
-
-  SourceFileLangOptions evaluate(Evaluator &evaluator,
-                                 SourceFile *sourceFile) const;
-
-public:
-  bool isCached() const { return true; }
-  std::optional<SourceFileLangOptions> getCachedResult() const;
-  void cacheResult(SourceFileLangOptions value) const;
-};
-
 #define SWIFT_TYPEID_ZONE TypeChecker
 #define SWIFT_TYPEID_HEADER "swift/AST/TypeCheckerTypeIDZone.def"
 #include "swift/Basic/DefineTypeIDZone.h"

include/swift/AST/TypeCheckerTypeIDZone.def

@@ -626,6 +626,3 @@ SWIFT_REQUEST(TypeChecker, SemanticAvailabilitySpecRequest,
               std::optional<SemanticAvailabilitySpec>
               (const AvailabilitySpec *, const DeclContext *),
               SeparatelyCached, NoLocationInfo)
-
-SWIFT_REQUEST(TypeChecker, SourceFileLangOptionsRequest,
-              SourceFileLangOptions (SourceFile *), Cached, NoLocationInfo)

include/swift/Basic/Features.def

@@ -499,9 +499,6 @@ EXPERIMENTAL_FEATURE(CustomAvailability, true)
 /// is resilient or not.
 EXPERIMENTAL_FEATURE(ExtensibleEnums, true)
 
-/// Allow SwiftSettings
-EXPERIMENTAL_FEATURE(SwiftSettings, false)
-
 /// Syntax sugar features for concurrency.
 EXPERIMENTAL_FEATURE(ConcurrencySyntaxSugar, true)
 

lib/AST/ASTPrinter.cpp

@@ -4797,9 +4797,6 @@ void PrintAST::visitMacroDecl(MacroDecl *decl) {
         case BuiltinMacroKind::IsolationMacro:
           Printer << "IsolationMacro";
           break;
-        case BuiltinMacroKind::SwiftSettingsMacro:
-          Printer << "SwiftSettingsMacro";
-          break;
         }
         break;
 

lib/AST/FeatureSet.cpp

@@ -449,14 +449,6 @@ UNINTERESTING_FEATURE(CoroutineAccessorsUnwindOnCallerError)
 UNINTERESTING_FEATURE(AllowRuntimeSymbolDeclarations)
 UNINTERESTING_FEATURE(CopyBlockOptimization)
 
-static bool usesFeatureSwiftSettings(const Decl *decl) {
-  // We just need to guard `#SwiftSettings`.
-  auto *macro = dyn_cast<MacroDecl>(decl);
-  return macro && macro->isStdlibDecl() &&
-         macro->getMacroRoles().contains(MacroRole::Declaration) &&
-         macro->getBaseIdentifier().is("SwiftSettings");
-}
-
 bool swift::usesFeatureIsolatedDeinit(const Decl *decl) {
   if (auto cd = dyn_cast<ClassDecl>(decl)) {
     return cd->getFormalAccess() == AccessLevel::Open &&