Merge pull request #4044 from swiftwasm/main

Author: MaxDesiatov

cmake/modules/StandaloneOverlay.cmake

@@ -1,3 +1,10 @@
+# In some configurations (e.g. back deploy concurrency) we
+# configure the build from the root of the Swift repo but we skip
+# stdlib/CMakeLists.txt, with the risk of missing important parameters.
+# To account for this scenario, we include the stdlib options
+# before the guard
+include(${CMAKE_CURRENT_LIST_DIR}/../../stdlib/cmake/modules/StdlibOptions.cmake)
+
 # CMAKE_SOURCE_DIR is the directory that cmake got initially invoked on.
 # CMAKE_CURRENT_SOURCE_DIR is the current directory. If these are equal, it's
 # a top-level build of the CMAKE_SOURCE_DIR. Otherwise, define a guard variable
@@ -85,10 +92,6 @@ set(SWIFT_DARWIN_MODULE_ARCHS "" CACHE STRING
 targets on Darwin platforms. These targets are in addition to the full \
 library targets.")
 
-option(SWIFT_STDLIB_SHORT_MANGLING_LOOKUPS
-       "Build stdlib with fast-path context descriptor lookups based on well-known short manglings."
-       TRUE)
-
 # -----------------------------------------------------------------------------
 # Constants
 

include/swift/AST/TBDGenRequests.h

@@ -50,8 +50,13 @@ class TBDGenDescriptor final {
   FileOrModule Input;
   TBDGenOptions Opts;
 
-  TBDGenDescriptor(FileOrModule input, const TBDGenOptions &opts)
-      : Input(input), Opts(opts) {
+  /// Symbols (e.g. function names) which are made public by the
+  /// CrossModuleOptimization pass and therefore must be included in the TBD file.
+  TBDSymbolSetPtr publicCMOSymbols;
+
+  TBDGenDescriptor(FileOrModule input, const TBDGenOptions &opts,
+                   TBDSymbolSetPtr publicCMOSymbols)
+      : Input(input), Opts(opts), publicCMOSymbols(publicCMOSymbols) {
     assert(input);
   }
 
@@ -73,17 +78,21 @@ class TBDGenDescriptor final {
   const StringRef getDataLayoutString() const;
   const llvm::Triple &getTarget() const;
 
+  TBDSymbolSetPtr getPublicCMOSymbols() const { return publicCMOSymbols; }
+
   bool operator==(const TBDGenDescriptor &other) const;
   bool operator!=(const TBDGenDescriptor &other) const {
     return !(*this == other);
   }
 
-  static TBDGenDescriptor forFile(FileUnit *file, const TBDGenOptions &opts) {
-    return TBDGenDescriptor(file, opts);
+  static TBDGenDescriptor forFile(FileUnit *file, const TBDGenOptions &opts,
+                                  TBDSymbolSetPtr publicCMOSymbols) {
+    return TBDGenDescriptor(file, opts, publicCMOSymbols);
   }
 
-  static TBDGenDescriptor forModule(ModuleDecl *M, const TBDGenOptions &opts) {
-    return TBDGenDescriptor(M, opts);
+  static TBDGenDescriptor forModule(ModuleDecl *M, const TBDGenOptions &opts,
+                                    TBDSymbolSetPtr publicCMOSymbols) {
+    return TBDGenDescriptor(M, opts, publicCMOSymbols);
   }
 };
 
@@ -154,6 +163,9 @@ class SymbolSource {
     /// A symbol used to customize linker behavior, introduced by TBDGen.
     LinkerDirective,
 
+    /// A symbol which was made public by the CrossModuleOptimization pass.
+    CrossModuleOptimization,
+
     /// A symbol with an unknown origin.
     // FIXME: This should be eliminated.
     Unknown
@@ -173,7 +185,8 @@ class SymbolSource {
     irEntity = entity;
   }
   explicit SymbolSource(Kind kind) : kind(kind) {
-    assert(kind == Kind::LinkerDirective || kind == Kind::Unknown);
+    assert(kind == Kind::LinkerDirective || kind == Kind::Unknown ||
+           kind == Kind::CrossModuleOptimization);
   }
 
 public:
@@ -186,6 +199,9 @@ class SymbolSource {
   static SymbolSource forLinkerDirective() {
     return SymbolSource{Kind::LinkerDirective};
   }
+  static SymbolSource forCrossModuleOptimization() {
+    return SymbolSource{Kind::CrossModuleOptimization};
+  }
   static SymbolSource forUnknown() {
     return SymbolSource{Kind::Unknown};
   }
@@ -194,6 +210,10 @@ class SymbolSource {
     return kind == Kind::LinkerDirective;
   }
 
+  bool isFromCrossModuleOptimization() const {
+    return kind == Kind::CrossModuleOptimization;
+  }
+
   SILDeclRef getSILDeclRef() const {
     assert(kind == Kind::SIL);
     return silDeclRef;

include/swift/Frontend/Frontend.h

@@ -432,6 +432,7 @@ class CompilerInstance {
   std::unique_ptr<ASTContext> Context;
   std::unique_ptr<Lowering::TypeConverter> TheSILTypes;
   std::unique_ptr<DiagnosticVerifier> DiagVerifier;
+  TBDSymbolSetPtr publicCMOSymbols;
 
   /// A cache describing the set of inter-module dependencies that have been queried.
   /// Null if not present.
@@ -583,6 +584,10 @@ class CompilerInstance {
   /// file.
   SourceFile *getCodeCompletionFile() const;
 
+  /// Return the symbols (e.g. function names) which are made public by the
+  /// CrossModuleOptimization pass and therefore must be included in the TBD file.
+  TBDSymbolSetPtr getPublicCMOSymbols() const { return publicCMOSymbols; }
+
 private:
   /// Set up the file system by loading and validating all VFS overlay YAML
   /// files. If the process of validating VFS files failed, or the overlay

include/swift/Reflection/TypeRef.h

@@ -38,22 +38,13 @@ enum class TypeRefKind {
 #undef TYPEREF
 };
 
-// MSVC reports an error if we use "template"
-// Clang reports an error if we don't use "template"
-#if defined(__clang__) || defined(__GNUC__)
-#  define DEPENDENT_TEMPLATE template
-#else
-#  define DEPENDENT_TEMPLATE
-#endif
-
 #define FIND_OR_CREATE_TYPEREF(Allocator, TypeRefTy, ...)                      \
   auto ID = Profile(__VA_ARGS__);                                              \
-  const auto Entry = Allocator.TypeRefTy##s.find(ID);      \
-  if (Entry != Allocator.TypeRefTy##s.end())               \
+  const auto Entry = Allocator.TypeRefTy##s.find(ID);                          \
+  if (Entry != Allocator.TypeRefTy##s.end())                                   \
     return Entry->second;                                                      \
-  const auto TR =                                                              \
-      Allocator.DEPENDENT_TEMPLATE makeTypeRef<TypeRefTy>(__VA_ARGS__);        \
-  Allocator.TypeRefTy##s.insert({ID, TR});                 \
+  const auto TR = Allocator.template makeTypeRef<TypeRefTy>(__VA_ARGS__);      \
+  Allocator.TypeRefTy##s.insert({ID, TR});                                     \
   return TR;
 
 /// An identifier containing the unique bit pattern made up of all of the

include/swift/SIL/SILBridging.h

@@ -15,7 +15,10 @@
 
 #include "BridgedSwiftObject.h"
 #include <stddef.h>
-#include <string>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 SWIFT_BEGIN_NULLABILITY_ANNOTATIONS
 
@@ -161,19 +164,19 @@ BridgedSlab PassContext_freeSlab(BridgedPassContext passContext,
                                  BridgedSlab slab);
 
 BridgedStringRef SILFunction_getName(BridgedFunction function);
-std::string SILFunction_debugDescription(BridgedFunction function);
+BridgedStringRef SILFunction_debugDescription(BridgedFunction function);
 OptionalBridgedBasicBlock SILFunction_firstBlock(BridgedFunction function);
 OptionalBridgedBasicBlock SILFunction_lastBlock(BridgedFunction function);
 SwiftInt SILFunction_numIndirectResultArguments(BridgedFunction function);
 SwiftInt SILFunction_getSelfArgumentIndex(BridgedFunction function);
 
 BridgedStringRef SILGlobalVariable_getName(BridgedGlobalVar global);
-std::string SILGlobalVariable_debugDescription(BridgedGlobalVar global);
+BridgedStringRef SILGlobalVariable_debugDescription(BridgedGlobalVar global);
 
 OptionalBridgedBasicBlock SILBasicBlock_next(BridgedBasicBlock block);
 OptionalBridgedBasicBlock SILBasicBlock_previous(BridgedBasicBlock block);
 BridgedFunction SILBasicBlock_getFunction(BridgedBasicBlock block);
-std::string SILBasicBlock_debugDescription(BridgedBasicBlock block);
+BridgedStringRef SILBasicBlock_debugDescription(BridgedBasicBlock block);
 OptionalBridgedInstruction SILBasicBlock_firstInst(BridgedBasicBlock block);
 OptionalBridgedInstruction SILBasicBlock_lastInst(BridgedBasicBlock block);
 SwiftInt SILBasicBlock_getNumArguments(BridgedBasicBlock block);
@@ -188,7 +191,7 @@ OptionalBridgedOperand Operand_nextUse(BridgedOperand);
 BridgedInstruction Operand_getUser(BridgedOperand);
 SwiftInt Operand_isTypeDependent(BridgedOperand);
 
-std::string SILNode_debugDescription(BridgedNode node);
+BridgedStringRef SILNode_debugDescription(BridgedNode node);
 OptionalBridgedOperand SILValue_firstUse(BridgedValue value);
 BridgedType SILValue_getType(BridgedValue value);
 
@@ -242,4 +245,8 @@ BridgedInstruction SILBuilder_createIntegerLiteral(BridgedInstruction insertionP
 
 SWIFT_END_NULLABILITY_ANNOTATIONS
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif

include/swift/SIL/SILModule.h

@@ -38,6 +38,7 @@
 #include "swift/SIL/SILVTable.h"
 #include "swift/SIL/SILWitnessTable.h"
 #include "swift/SIL/TypeLowering.h"
+#include "swift/TBDGen/TBDGen.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/FoldingSet.h"
 #include "llvm/ADT/MapVector.h"
@@ -367,6 +368,10 @@ class SILModule {
 
   /// Folding set for key path patterns.
   llvm::FoldingSet<KeyPathPattern> KeyPathPatterns;
+  
+  /// Symbols (e.g. function names) which are made public by the
+  /// CrossModuleOptimization pass and therefore must be included in the TBD file.
+  TBDSymbolSetPtr publicCMOSymbols;
 
 public:
   ~SILModule();
@@ -506,6 +511,12 @@ class SILModule {
 
   const SILOptions &getOptions() const { return Options; }
 
+  /// Return the symbols (e.g. function names) which are made public by the
+  /// CrossModuleOptimization pass and therefore must be included in the TBD file.
+  TBDSymbolSetPtr getPublicCMOSymbols() { return publicCMOSymbols; }
+
+  void addPublicCMOSymbol(StringRef symbol);
+
   using iterator = FunctionListType::iterator;
   using const_iterator = FunctionListType::const_iterator;
   FunctionListType &getFunctionList() { return functions; }

include/swift/SILOptimizer/PassManager/Passes.def

@@ -110,8 +110,8 @@ PASS(AccessEnforcementSelection, "access-enforcement-selection",
      "Access Enforcement Selection")
 PASS(AccessEnforcementWMO, "access-enforcement-wmo",
      "Access Enforcement Whole Module Optimization")
-PASS(CrossModuleSerializationSetup, "cross-module-serialization-setup",
-     "Setup serialization flags for cross-module optimization")
+PASS(CrossModuleOptimization, "cmo",
+     "Perform cross-module optimization")
 PASS(AccessSummaryDumper, "access-summary-dump",
      "Dump Address Parameter Access Summary")
 PASS(AccessStorageAnalysisDumper, "access-storage-analysis-dump",
@@ -405,8 +405,6 @@ PASS(SimplifyUnreachableContainingBlocks, "simplify-unreachable-containing-block
      "Utility pass. Removes all non-term insts from blocks with unreachable terms")
 PASS(SerializeSILPass, "serialize-sil",
      "Utility pass. Serializes the current SILModule")
-PASS(CMOSerializeSILPass, "cmo-serialize-sil",
-     "Utility pass. Serializes the current SILModule for cross-module-optimization")
 PASS(YieldOnceCheck, "yield-once-check",
     "Check correct usage of yields in yield-once coroutines")
 PASS(OSLogOptimization, "os-log-optimization", "Optimize os log calls")

include/swift/TBDGen/TBDGen.h

@@ -16,6 +16,9 @@
 #include "llvm/ADT/StringSet.h"
 #include "swift/Basic/Version.h"
 #include <vector>
+#include <set>
+#include <string>
+#include <memory>
 
 namespace llvm {
 class raw_ostream;
@@ -104,12 +107,26 @@ struct TBDGenOptions {
   }
 };
 
+/// Used for symbols which are made public by the CrossModuleOptimization pass
+/// and therefore must be included in the TBD file.
+///
+/// We cannot use llvm::StringSet, because we need deterministic iteration order.
+using TBDSymbolSet = std::set<std::string>;
+
+/// A pointer to TBDSymbolSet.
+///
+/// Do reference counting for memory management.
+/// This set is created in the optimizer and primarily stored in the SILModule.
+/// But then they need to be kept alive beyond the lifetime of the SILModule.
+using TBDSymbolSetPtr = std::shared_ptr<TBDSymbolSet>;
+
 std::vector<std::string> getPublicSymbols(TBDGenDescriptor desc);
 
 void writeTBDFile(ModuleDecl *M, llvm::raw_ostream &os,
-                  const TBDGenOptions &opts);
+                  const TBDGenOptions &opts, TBDSymbolSetPtr publicCMOSymbols);
 
-void writeAPIJSONFile(ModuleDecl *M, llvm::raw_ostream &os, bool PrettyPrint);
+void writeAPIJSONFile(ModuleDecl *M, llvm::raw_ostream &os, bool PrettyPrint,
+                      TBDSymbolSetPtr publicCMOSymbols);
 
 } // end namespace swift
 

lib/AST/Module.cpp

@@ -2374,17 +2374,18 @@ canBeUsedForCrossModuleOptimization(DeclContext *ctxt) const {
   // See if context is imported in a "regular" way, i.e. not with
   // @_implementationOnly or @_spi.
   ModuleDecl::ImportFilter filter = {
-    ModuleDecl::ImportFilterKind::Exported,
-    ModuleDecl::ImportFilterKind::Default};
+    ModuleDecl::ImportFilterKind::ImplementationOnly,
+    ModuleDecl::ImportFilterKind::SPIAccessControl
+  };
   SmallVector<ImportedModule, 4> results;
   getImportedModules(results, filter);
 
   auto &imports = getASTContext().getImportCache();
   for (auto &desc : results) {
     if (imports.isImportedBy(moduleOfCtxt, desc.importedModule))
-      return true;
+      return false;
   }
-  return false;
+  return true;
 }
 
 void SourceFile::lookupImportedSPIGroups(

lib/AST/RequirementMachine/PropertyUnification.cpp

@@ -650,11 +650,13 @@ RewriteSystem::TypeWitness::TypeWitness(
          getConcreteConformance().getProtocol());
 }
 
-bool swift::rewriting::operator==(
-    const RewriteSystem::TypeWitness &lhs,
-    const RewriteSystem::TypeWitness &rhs) {
-  return (lhs.LHS == rhs.LHS &&
-          lhs.RHS == rhs.RHS);
+namespace swift {
+namespace rewriting {
+bool operator==(const RewriteSystem::TypeWitness &lhs,
+                const RewriteSystem::TypeWitness &rhs) {
+  return lhs.LHS == rhs.LHS && lhs.RHS == rhs.RHS;
+}
+}
 }
 
 void RewriteSystem::TypeWitness::dump(llvm::raw_ostream &out) const {
@@ -906,4 +908,4 @@ void PropertyMap::recordConcreteConformanceRule(
   path.invert();
 
   inducedRules.emplace_back(std::move(lhs), std::move(rhs), std::move(path));
-}
+}

lib/DriverTool/swift_api_extract_main.cpp

@@ -215,7 +215,7 @@ class SwiftAPIExtractInvocation {
       return 1;
 
     if (OutputFilename == "-") {
-      writeAPIJSONFile(M, llvm::outs(), PrettyPrint);
+      writeAPIJSONFile(M, llvm::outs(), PrettyPrint, nullptr);
       return 0;
     }
 
@@ -227,7 +227,7 @@ class SwiftAPIExtractInvocation {
       return 1;
     }
 
-    writeAPIJSONFile(M, OS, PrettyPrint);
+    writeAPIJSONFile(M, OS, PrettyPrint, nullptr);
     return 0;
   }
 };

lib/Frontend/Frontend.cpp

@@ -1336,6 +1336,8 @@ bool CompilerInstance::performSILProcessing(SILModule *silModule) {
 
   performSILOptimizations(Invocation, silModule);
 
+  publicCMOSymbols = silModule->getPublicCMOSymbols();
+
   if (auto *stats = getStatsReporter())
     countStatsPostSILOpt(*stats, *silModule);