Merge pull request #4285 from swiftwasm/main

Author: MaxDesiatov

include/swift/ABI/ObjectFile.h

@@ -28,6 +28,11 @@ class SwiftObjectFileFormat {
   virtual llvm::Optional<llvm::StringRef> getSegmentName() {
     return {};
   }
+  /// Get the name of the segment in the symbol rich binary that may contain
+  /// Swift meteadata.
+  virtual llvm::Optional<llvm::StringRef> getSymbolRichSegmentName() {
+    return {};
+  }
   /// Predicate to identify if the named section can contain reflection data.
   virtual bool sectionContainsReflectionData(llvm::StringRef sectionName) = 0;
 };
@@ -45,10 +50,15 @@ class SwiftObjectFileFormatMachO : public SwiftObjectFileFormat {
     }
     llvm_unreachable("Section type not found.");
   }
+
   llvm::Optional<llvm::StringRef> getSegmentName() override {
     return {"__TEXT"};
   }
 
+  llvm::Optional<llvm::StringRef> getSymbolRichSegmentName() override {
+    return {"__DWARF"};
+  }
+
   bool sectionContainsReflectionData(llvm::StringRef sectionName) override {
     return sectionName.startswith("__swift5_") || sectionName == "__const";
   }

include/swift/AST/ASTContext.h

@@ -1167,7 +1167,7 @@ class ASTContext final {
   /// conformance itself, along with a bit indicating whether this diagnostic
   /// produces an error.
   struct DelayedConformanceDiag {
-    ValueDecl *Requirement;
+    const ValueDecl *Requirement;
     std::function<void()> Callback;
     bool IsError;
   };

include/swift/AST/ClangModuleLoader.h

@@ -268,7 +268,7 @@ class ClangModuleLoader : public ModuleLoader {
              clang::DeclarationName givenName = clang::DeclarationName()) = 0;
 
   /// Determine the effective Clang context for the given Swift nominal type.
-  EffectiveClangContext virtual getEffectiveClangContext(
+  virtual EffectiveClangContext getEffectiveClangContext(
       const NominalTypeDecl *nominal) = 0;
 };
 

include/swift/AST/Decl.h

@@ -3495,7 +3495,9 @@ class NominalTypeDecl : public GenericTypeDecl, public IterableDeclContext {
          SmallVectorImpl<ProtocolConformance *> &conformances) const;
 
   /// Retrieve all of the protocols that this nominal type conforms to.
-  SmallVector<ProtocolDecl *, 2> getAllProtocols() const;
+  ///
+  /// \param sorted Whether to sort the protocols in canonical order.
+  SmallVector<ProtocolDecl *, 2> getAllProtocols(bool sorted = false) const;
 
   /// Retrieve all of the protocol conformances for this nominal type.
   SmallVector<ProtocolConformance *, 2> getAllConformances(

include/swift/AST/FileUnit.h

@@ -246,7 +246,7 @@ class FileUnit : public DeclContext, public ASTAllocated<FileUnit> {
   ///
   /// This can differ from \c getTopLevelDecls, e.g. it returns decls from a
   /// shadowed clang module.
-  virtual void getDisplayDecls(SmallVectorImpl<Decl*> &results) const {
+  virtual void getDisplayDecls(SmallVectorImpl<Decl*> &results, bool recursive = false) const {
     getTopLevelDecls(results);
   }
 

include/swift/AST/Module.h

@@ -780,7 +780,7 @@ class ModuleDecl
   /// shadowed clang module. It does not force synthesized top-level decls that
   /// should be printed to be added; use \c swift::getTopLevelDeclsForDisplay()
   /// for that.
-  void getDisplayDecls(SmallVectorImpl<Decl*> &results) const;
+  void getDisplayDecls(SmallVectorImpl<Decl*> &results, bool recursive = false) const;
 
   using LinkLibraryCallback = llvm::function_ref<void(LinkLibrary)>;
 

include/swift/Basic/LangOptions.h

@@ -530,6 +530,9 @@ namespace swift {
     RequirementMachineMode RequirementMachineInferredSignatures =
         RequirementMachineMode::Disabled;
 
+    /// Enables dumping type witness systems from associated type inference.
+    bool DumpTypeWitnessSystems = false;
+
     /// Sets the target we are building for and updates platform conditions
     /// to match.
     ///

include/swift/ClangImporter/ClangModule.h

@@ -91,7 +91,7 @@ class ClangModuleUnit final : public LoadedFile {
 
   virtual void getTopLevelDecls(SmallVectorImpl<Decl*> &results) const override;
 
-  virtual void getDisplayDecls(SmallVectorImpl<Decl*> &results) const override;
+  virtual void getDisplayDecls(SmallVectorImpl<Decl*> &results, bool recursive = false) const override;
 
   virtual void
   getImportedModules(SmallVectorImpl<ImportedModule> &imports,

include/swift/IRGen/IRGenPublic.h

@@ -31,7 +31,7 @@ class IRGenModule;
 std::pair<IRGenerator *, IRGenModule *>
 createIRGenModule(SILModule *SILMod, StringRef OutputFilename,
                   StringRef MainInputFilenameForDebugInfo,
-                  StringRef PrivateDiscriminator);
+                  StringRef PrivateDiscriminator, IRGenOptions &options);
 
 /// Delete the IRGenModule and IRGenerator obtained by the above call.
 void deleteIRGenModule(std::pair<IRGenerator *, IRGenModule *> &Module);

include/swift/Option/FrontendOptions.td

@@ -352,6 +352,9 @@ def requirement_machine_max_concrete_nesting : Joined<["-"], "requirement-machin
   Flags<[FrontendOption, HelpHidden, DoesNotAffectIncrementalBuild]>,
   HelpText<"Set the maximum concrete type nesting depth before giving up">;
 
+def dump_type_witness_systems : Flag<["-"], "dump-type-witness-systems">,
+  HelpText<"Enables dumping type witness systems from associated type inference">;
+
 def debug_generic_signatures : Flag<["-"], "debug-generic-signatures">,
   HelpText<"Debug generic signatures">;