Merge pull request swiftlang#77314 from meg-gupta/ossaflag

Remove -enable-ossa-modules for Synchronization and Distributed

Author: meg-gupta

include/swift/AST/ASTContext.h

@@ -27,11 +27,12 @@
 #include "swift/AST/Type.h"
 #include "swift/AST/TypeAlignments.h"
 #include "swift/AST/Types.h"
+#include "swift/Basic/BlockList.h"
 #include "swift/Basic/CASOptions.h"
 #include "swift/Basic/LangOptions.h"
 #include "swift/Basic/Located.h"
 #include "swift/Basic/Malloc.h"
-#include "swift/Basic/BlockList.h"
+#include "swift/Serialization/SerializationOptions.h"
 #include "swift/SymbolGraphGen/SymbolGraphOptions.h"
 #include "clang/AST/DeclTemplate.h"
 #include "clang/Basic/DarwinSDKInfo.h"
@@ -266,7 +267,8 @@ class ASTContext final {
       SILOptions &silOpts, SearchPathOptions &SearchPathOpts,
       ClangImporterOptions &ClangImporterOpts,
       symbolgraphgen::SymbolGraphOptions &SymbolGraphOpts, CASOptions &casOpts,
-      SourceManager &SourceMgr, DiagnosticEngine &Diags,
+      SerializationOptions &serializationOpts, SourceManager &SourceMgr,
+      DiagnosticEngine &Diags,
       llvm::IntrusiveRefCntPtr<llvm::vfs::OutputBackend> OutBackend = nullptr);
 
 public:
@@ -283,7 +285,8 @@ class ASTContext final {
       SILOptions &silOpts, SearchPathOptions &SearchPathOpts,
       ClangImporterOptions &ClangImporterOpts,
       symbolgraphgen::SymbolGraphOptions &SymbolGraphOpts, CASOptions &casOpts,
-      SourceManager &SourceMgr, DiagnosticEngine &Diags,
+      SerializationOptions &serializationOpts, SourceManager &SourceMgr,
+      DiagnosticEngine &Diags,
       llvm::IntrusiveRefCntPtr<llvm::vfs::OutputBackend> OutBackend = nullptr);
   ~ASTContext();
 
@@ -314,6 +317,9 @@ class ASTContext final {
   /// The CAS options used by this AST context.
   const CASOptions &CASOpts;
 
+  /// Options for Serialization
+  const SerializationOptions &SerializationOpts;
+
   /// The source manager object.
   SourceManager &SourceMgr;
 

include/swift/AST/DeclAttr.def

@@ -102,7 +102,7 @@ DECL_ATTR(_semantics, Semantics,
   OnAbstractFunction | OnSubscript | OnNominalType | OnVar | AllowMultipleAttributes | UserInaccessible | ABIStableToAdd | ABIStableToRemove | APIStableToAdd | APIStableToRemove,
   21)
 SIMPLE_DECL_ATTR(_transparent, Transparent,
-  OnFunc | OnAccessor | OnConstructor | OnVar | UserInaccessible | ABIStableToAdd | ABIStableToRemove | APIStableToAdd | APIStableToRemove,
+  OnFunc | OnAccessor | OnConstructor | OnVar | OnDestructor | UserInaccessible | ABIStableToAdd | ABIStableToRemove | APIStableToAdd | APIStableToRemove,
   26)
 SIMPLE_DECL_ATTR(requires_stored_property_inits, RequiresStoredPropertyInits,
   OnClass | ABIStableToAdd | ABIStableToRemove | APIStableToAdd | APIStableToRemove,

include/swift/AST/DiagnosticsSema.def

@@ -908,6 +908,9 @@ ERROR(serialization_target_too_new_repl,none,
       "deployment target of %0 %3: %4",
       (StringRef, llvm::VersionTuple, Identifier, llvm::VersionTuple,
        StringRef))
+ERROR(serialization_non_ossa_module_incompatible, Fatal,
+      "cannot import non-OSSA module into an OSSA module",
+      (Identifier))
 
 ERROR(serialization_fatal,Fatal,
       "fatal error encountered while reading from module '%0'; "

include/swift/AST/SILOptions.h

@@ -188,6 +188,10 @@ class SILOptions {
   /// If this is disabled we do not serialize in OSSA form when optimizing.
   bool EnableOSSAModules = false;
 
+  /// Allow recompilation of a non-OSSA module to an OSSA module when imported
+  /// from another OSSA module.
+  bool EnableRecompilationToOSSAModule = false;
+
   /// If set to true, compile with the SIL Opaque Values enabled.
   bool EnableSILOpaqueValues = false;
 

include/swift/Frontend/Frontend.h

@@ -103,6 +103,7 @@ class CompilerInvocation {
   TBDGenOptions TBDGenOpts;
   ModuleInterfaceOptions ModuleInterfaceOpts;
   CASOptions CASOpts;
+  SerializationOptions SerializationOpts;
   llvm::MemoryBuffer *IDEInspectionTargetBuffer = nullptr;
 
   /// The offset that IDEInspection wants to further examine in offset of bytes
@@ -326,6 +327,11 @@ class CompilerInvocation {
   IRGenOptions &getIRGenOptions() { return IRGenOpts; }
   const IRGenOptions &getIRGenOptions() const { return IRGenOpts; }
 
+  SerializationOptions &getSerializationOptions() { return SerializationOpts; }
+  const SerializationOptions &getSerializationOptions() const {
+    return SerializationOpts;
+  }
+
   void setParseStdlib() {
     FrontendOpts.ParseStdlib = true;
   }

include/swift/Option/FrontendOptions.td

@@ -1226,6 +1226,9 @@ let Flags = [FrontendOption, NoDriverOption, HelpHidden, ModuleInterfaceOptionIg
             "when optimizing ownership will be lowered before serializing SIL">;
 }
 
+def enable_recompilation_to_ossa_module : Flag<["-"], "enable-recompilation-to-ossa-module">,
+  HelpText<"Allow recompilation of a non-OSSA module to an OSSA module when imported from another OSSA module">;
+
 def enable_sil_opaque_values : Flag<["-"], "enable-sil-opaque-values">,
   HelpText<"Enable SIL Opaque Values">;
 

include/swift/Serialization/SerializationOptions.h

@@ -24,144 +24,144 @@
 
 namespace swift {
 
-  class SerializationOptions {
-    SerializationOptions(const SerializationOptions &) = delete;
-    void operator=(const SerializationOptions &) = delete;
+class SerializationOptions {
+public:
+  SerializationOptions() = default;
+  SerializationOptions(SerializationOptions &&) = default;
+  SerializationOptions &operator=(SerializationOptions &&) = default;
+  SerializationOptions(const SerializationOptions &) = default;
+  SerializationOptions &operator=(const SerializationOptions &) = default;
+  ~SerializationOptions() = default;
+
+  StringRef OutputPath;
+  StringRef DocOutputPath;
+  StringRef SourceInfoOutputPath;
+  std::string ABIDescriptorPath;
+  bool emptyABIDescriptor = false;
+  llvm::VersionTuple UserModuleVersion;
+  std::set<std::string> AllowableClients;
+  std::string SDKName;
+  std::string SDKVersion;
+
+  StringRef GroupInfoPath;
+  StringRef ImportedHeader;
+  StringRef ModuleLinkName;
+  StringRef ModuleInterface;
+  std::vector<std::string> ExtraClangOptions;
+  std::vector<swift::PluginSearchOption> PluginSearchOptions;
+
+  /// Path prefixes that should be rewritten in debug info.
+  PathRemapper DebuggingOptionsPrefixMap;
+
+  /// Obfuscate the serialized paths so we don't have the actual paths encoded
+  /// in the .swiftmodule file.
+  PathObfuscator PathObfuscator;
+
+  /// Describes a single-file dependency for this module, along with the
+  /// appropriate strategy for how to verify if it's up-to-date.
+  class FileDependency {
+    /// The size of the file on disk, in bytes.
+    uint64_t Size : 62;
+
+    /// A dependency can be either hash-based or modification-time-based.
+    bool IsHashBased : 1;
+
+    /// The dependency path can be absolute or relative to the SDK
+    bool IsSDKRelative : 1;
+
+    union {
+      /// The last modification time of the file.
+      uint64_t ModificationTime;
+
+      /// The xxHash of the full contents of the file.
+      uint64_t ContentHash;
+    };
+
+    /// The path to the dependency.
+    std::string Path;
+
+    FileDependency(uint64_t size, bool isHash, uint64_t hashOrModTime,
+                   StringRef path, bool isSDKRelative)
+        : Size(size), IsHashBased(isHash), IsSDKRelative(isSDKRelative),
+          ModificationTime(hashOrModTime), Path(path) {}
 
   public:
-    SerializationOptions() = default;
-    SerializationOptions(SerializationOptions &&) = default;
-    SerializationOptions &operator=(SerializationOptions &&) = default;
-    ~SerializationOptions() = default;
-
-    StringRef OutputPath;
-    StringRef DocOutputPath;
-    StringRef SourceInfoOutputPath;
-    std::string ABIDescriptorPath;
-    bool emptyABIDescriptor = false;
-    llvm::VersionTuple UserModuleVersion;
-    std::set<std::string> AllowableClients;
-    std::string SDKName;
-    std::string SDKVersion;
-
-    StringRef GroupInfoPath;
-    StringRef ImportedHeader;
-    StringRef ModuleLinkName;
-    StringRef ModuleInterface;
-    std::vector<std::string> ExtraClangOptions;
-    std::vector<swift::PluginSearchOption> PluginSearchOptions;
-
-    /// Path prefixes that should be rewritten in debug info.
-    PathRemapper DebuggingOptionsPrefixMap;
-
-    /// Obfuscate the serialized paths so we don't have the actual paths encoded
-    /// in the .swiftmodule file.
-    PathObfuscator PathObfuscator;
-
-    /// Describes a single-file dependency for this module, along with the
-    /// appropriate strategy for how to verify if it's up-to-date.
-    class FileDependency {
-      /// The size of the file on disk, in bytes.
-      uint64_t Size : 62;
-
-      /// A dependency can be either hash-based or modification-time-based.
-      bool IsHashBased : 1;
-
-      /// The dependency path can be absolute or relative to the SDK
-      bool IsSDKRelative : 1;
-
-      union {
-        /// The last modification time of the file.
-        uint64_t ModificationTime;
-
-        /// The xxHash of the full contents of the file.
-        uint64_t ContentHash;
-      };
-
-      /// The path to the dependency.
-      std::string Path;
-
-      FileDependency(uint64_t size, bool isHash, uint64_t hashOrModTime,
-                     StringRef path, bool isSDKRelative):
-        Size(size), IsHashBased(isHash), IsSDKRelative(isSDKRelative),
-        ModificationTime(hashOrModTime), Path(path) {}
-    public:
-      FileDependency() = delete;
-
-      /// Creates a new hash-based file dependency.
-      static FileDependency
-      hashBased(StringRef path, bool isSDKRelative, uint64_t size, uint64_t hash) {
-        return FileDependency(size, /*isHash*/true, hash, path, isSDKRelative);
-      }
-
-      /// Creates a new modification time-based file dependency.
-      static FileDependency
-      modTimeBased(StringRef path, bool isSDKRelative, uint64_t size, uint64_t mtime) {
-        return FileDependency(size, /*isHash*/false, mtime, path, isSDKRelative);
-      }
-
-      /// Updates the last-modified time of this dependency.
-      /// If the dependency is a hash-based dependency, it becomes
-      /// modification time-based.
-      void setLastModificationTime(uint64_t mtime) {
-        IsHashBased = false;
-        ModificationTime = mtime;
-      }
-
-      /// Updates the content hash of this dependency.
-      /// If the dependency is a modification time-based dependency, it becomes
-      /// hash-based.
-      void setContentHash(uint64_t hash) {
-        IsHashBased = true;
-        ContentHash = hash;
-      }
-
-      /// Determines if this dependency is hash-based and should be validated
-      /// based on content hash.
-      bool isHashBased() const { return IsHashBased; }
-
-      /// Determines if this dependency is absolute or relative to the SDK.
-      bool isSDKRelative() const { return IsSDKRelative; }
-
-      /// Determines if this dependency is hash-based and should be validated
-      /// based on modification time.
-      bool isModificationTimeBased() const { return !IsHashBased; }
-
-      /// Gets the modification time, if this is a modification time-based
-      /// dependency.
-      uint64_t getModificationTime() const {
-        assert(isModificationTimeBased() &&
-               "cannot get modification time for hash-based dependency");
-        return ModificationTime;
-      }
-
-      /// Gets the content hash, if this is a hash-based
-      /// dependency.
-      uint64_t getContentHash() const {
-        assert(isHashBased() &&
-               "cannot get content hash for mtime-based dependency");
-        return ContentHash;
-      }
-
-      StringRef getPath() const { return Path; }
-      uint64_t getSize() const { return Size; }
-    };
-    ArrayRef<FileDependency> Dependencies;
-    ArrayRef<std::string> PublicDependentLibraries;
-
-    bool AutolinkForceLoad = false;
-    bool SerializeAllSIL = false;
-    bool SerializeOptionsForDebugging = false;
-    bool IsSIB = false;
-    bool DisableCrossModuleIncrementalInfo = false;
-    bool StaticLibrary = false;
-    bool HermeticSealAtLink = false;
-    bool EmbeddedSwiftModule = false;
-    bool IsOSSA = false;
-    bool SkipNonExportableDecls = false;
-    bool ExplicitModuleBuild = false;
-    bool EnableSerializationRemarks = false;
+    FileDependency() = delete;
+
+    /// Creates a new hash-based file dependency.
+    static FileDependency hashBased(StringRef path, bool isSDKRelative,
+                                    uint64_t size, uint64_t hash) {
+      return FileDependency(size, /*isHash*/ true, hash, path, isSDKRelative);
+    }
+
+    /// Creates a new modification time-based file dependency.
+    static FileDependency modTimeBased(StringRef path, bool isSDKRelative,
+                                       uint64_t size, uint64_t mtime) {
+      return FileDependency(size, /*isHash*/ false, mtime, path, isSDKRelative);
+    }
+
+    /// Updates the last-modified time of this dependency.
+    /// If the dependency is a hash-based dependency, it becomes
+    /// modification time-based.
+    void setLastModificationTime(uint64_t mtime) {
+      IsHashBased = false;
+      ModificationTime = mtime;
+    }
+
+    /// Updates the content hash of this dependency.
+    /// If the dependency is a modification time-based dependency, it becomes
+    /// hash-based.
+    void setContentHash(uint64_t hash) {
+      IsHashBased = true;
+      ContentHash = hash;
+    }
+
+    /// Determines if this dependency is hash-based and should be validated
+    /// based on content hash.
+    bool isHashBased() const { return IsHashBased; }
+
+    /// Determines if this dependency is absolute or relative to the SDK.
+    bool isSDKRelative() const { return IsSDKRelative; }
+
+    /// Determines if this dependency is hash-based and should be validated
+    /// based on modification time.
+    bool isModificationTimeBased() const { return !IsHashBased; }
+
+    /// Gets the modification time, if this is a modification time-based
+    /// dependency.
+    uint64_t getModificationTime() const {
+      assert(isModificationTimeBased() &&
+             "cannot get modification time for hash-based dependency");
+      return ModificationTime;
+    }
+
+    /// Gets the content hash, if this is a hash-based
+    /// dependency.
+    uint64_t getContentHash() const {
+      assert(isHashBased() &&
+             "cannot get content hash for mtime-based dependency");
+      return ContentHash;
+    }
+
+    StringRef getPath() const { return Path; }
+    uint64_t getSize() const { return Size; }
   };
+  ArrayRef<FileDependency> Dependencies;
+  ArrayRef<std::string> PublicDependentLibraries;
+
+  bool AutolinkForceLoad = false;
+  bool SerializeAllSIL = false;
+  bool SerializeOptionsForDebugging = false;
+  bool IsSIB = false;
+  bool DisableCrossModuleIncrementalInfo = false;
+  bool StaticLibrary = false;
+  bool HermeticSealAtLink = false;
+  bool EmbeddedSwiftModule = false;
+  bool IsOSSA = false;
+  bool SkipNonExportableDecls = false;
+  bool ExplicitModuleBuild = false;
+  bool EnableSerializationRemarks = false;
+};
 
 } // end namespace swift
 #endif