Merge pull request #4135 from swiftwasm/main

Merge upstream `main`

Author: MaxDesiatov

include/swift/AST/DeclContext.h

@@ -73,6 +73,7 @@ namespace swift {
   class PrefixOperatorDecl;
   class ProtocolConformance;
   class ValueDecl;
+  class VarDecl;
   class Initializer;
   class ClassDecl;
   class SerializedAbstractClosureExpr;
@@ -355,6 +356,11 @@ class alignas(1 << DeclContextAlignInBits) DeclContext
   LLVM_READONLY
   ProtocolDecl *getExtendedProtocolDecl() const;
 
+  /// If this DeclContext is the initializer expression of a global or instance
+  /// property, return the VarDecl, otherwise return null.
+  LLVM_READONLY
+  VarDecl *getNonLocalVarDecl() const;
+
   /// Retrieve the generic parameter 'Self' from a protocol or
   /// protocol extension.
   ///

include/swift/AST/DiagnosticsFrontend.def

@@ -119,6 +119,8 @@ ERROR(error_mode_cannot_emit_reference_dependencies,none,
       "this mode does not support emitting reference dependency files", ())
 ERROR(error_mode_cannot_emit_header,none,
       "this mode does not support emitting Objective-C headers", ())
+ERROR(error_mode_cannot_emit_cxx_header,none,
+      "this mode does not support emitting C++ headers", ())
 ERROR(error_mode_cannot_emit_loaded_module_trace,none,
       "this mode does not support emitting the loaded module trace", ())
 ERROR(error_mode_cannot_emit_module,none,

include/swift/AST/DiagnosticsSema.def

@@ -4480,6 +4480,10 @@ ERROR(global_actor_from_nonactor_context,none,
       "%0 %1 isolated to global actor %2 can not be %select{referenced|mutated|used 'inout'}4"
       " from %select{this|a non-isolated}3%select{| synchronous}5 context",
       (DescriptiveDeclKind, DeclName, Type, bool, unsigned, bool))
+ERROR(global_actor_from_initializing_expr,none,
+      "expression requiring global actor %0 cannot appear in "
+        "default-value expression of %1 %2",
+      (Type, DescriptiveDeclKind, DeclName))
 ERROR(actor_isolated_call,none,
       "call to %0 function in a synchronous %1 context",
       (ActorIsolation, ActorIsolation))

include/swift/AST/FileUnit.h

@@ -16,6 +16,7 @@
 #include "swift/AST/Module.h"
 #include "swift/AST/RawComment.h"
 #include "swift/Basic/BasicSourceInfo.h"
+#include "swift/Basic/Debug.h"
 
 #include "llvm/ADT/PointerIntPair.h"
 
@@ -188,6 +189,8 @@ class FileUnit : public DeclContext, public ASTAllocated<FileUnit> {
   virtual Identifier
   getDiscriminatorForPrivateValue(const ValueDecl *D) const = 0;
 
+  virtual bool shouldCollectDisplayDecls() const { return true; }
+
   /// Finds all top-level decls in this file.
   ///
   /// This does a simple local lookup, not recursively looking through imports.
@@ -308,6 +311,9 @@ class FileUnit : public DeclContext, public ASTAllocated<FileUnit> {
     return getParentModule()->getRealName().str();
   }
 
+  SWIFT_DEBUG_DUMPER(dumpDisplayDecls());
+  SWIFT_DEBUG_DUMPER(dumpTopLevelDecls());
+
   /// Traverse the decls within this file.
   ///
   /// \returns true if traversal was aborted, false if it completed

include/swift/AST/Module.h

@@ -26,6 +26,7 @@
 #include "swift/AST/Type.h"
 #include "swift/Basic/BasicSourceInfo.h"
 #include "swift/Basic/Compiler.h"
+#include "swift/Basic/Debug.h"
 #include "swift/Basic/OptionSet.h"
 #include "swift/Basic/STLExtras.h"
 #include "swift/Basic/SourceLoc.h"
@@ -759,6 +760,15 @@ class ModuleDecl
   /// The order of the results is not guaranteed to be meaningful.
   void getPrecedenceGroups(SmallVectorImpl<PrecedenceGroupDecl*> &Results) const;
 
+  /// Determines whether this module should be recursed into when calling
+  /// \c getDisplayDecls.
+  ///
+  /// Some modules should not call \c getDisplayDecls, due to assertions
+  /// in their implementation. These are usually implicit imports that would be
+  /// recursed into for parsed modules. This function provides a guard against
+  /// recusing into modules that should not have decls collected.
+  bool shouldCollectDisplayDecls() const;
+
   /// Finds all top-level decls that should be displayed to a client of this
   /// module.
   ///
@@ -856,6 +866,9 @@ class ModuleDecl
   /// transferred from module files to the dSYMs, remove this.
   bool isExternallyConsumed() const;
 
+  SWIFT_DEBUG_DUMPER(dumpDisplayDecls());
+  SWIFT_DEBUG_DUMPER(dumpTopLevelDecls());
+
   SourceRange getSourceRange() const { return SourceRange(); }
 
   static bool classof(const DeclContext *DC) {

include/swift/AST/PrintOptions.h

@@ -200,6 +200,9 @@ struct PrintOptions {
   /// Print fully qualified extended types if ambiguous.
   bool FullyQualifiedExtendedTypesIfAmbiguous = false;
 
+  /// Whether to protocol-qualify DependentMemberTypes.
+  bool ProtocolQualifiedDependentMemberTypes = false;
+
   /// If true, printed module names will use the "exported" name, which may be
   /// different from the regular name.
   ///

include/swift/AST/SourceFile.h

@@ -288,6 +288,10 @@ class SourceFile final : public FileUnit {
 
   ~SourceFile();
 
+  bool hasImports() const {
+    return Imports.hasValue();
+  }
+
   /// Retrieve an immutable view of the source file's imports.
   ArrayRef<AttributedImport<ImportedModule>> getImports() const {
     return *Imports;

include/swift/AST/Types.h

@@ -5654,7 +5654,7 @@ class OpenedArchetypeType final : public ArchetypeType,
   /// \param knownID When non-empty, the known ID of the archetype. When empty,
   /// a fresh archetype with a unique ID will be opened.
   static CanTypeWrapper<OpenedArchetypeType> get(
-      Type existential, Optional<UUID> knownID = None);
+      CanType existential, Optional<UUID> knownID = None);
 
   /// Get or create an archetype that represents the opened type
   /// of an existential value.
@@ -5665,20 +5665,20 @@ class OpenedArchetypeType final : public ArchetypeType,
   /// \param knownID When non-empty, the known ID of the archetype. When empty,
   /// a fresh archetype with a unique ID will be opened.
   static CanTypeWrapper<OpenedArchetypeType> get(
-      Type existential, Type interfaceType, Optional<UUID> knownID = None);
+      CanType existential, Type interfaceType, Optional<UUID> knownID = None);
 
   /// Create a new archetype that represents the opened type
   /// of an existential value.
   ///
   /// \param existential The existential type or existential metatype to open.
   /// \param interfaceType The interface type represented by this archetype.
-  static CanType getAny(Type existential, Type interfaceType);
+  static CanType getAny(CanType existential, Type interfaceType);
 
   /// Create a new archetype that represents the opened type
   /// of an existential value.
   ///
   /// \param existential The existential type or existential metatype to open.
-  static CanType getAny(Type existential);
+  static CanType getAny(CanType existential);
 
   /// Retrieve the ID number of this opened existential.
   UUID getOpenedExistentialID() const;

include/swift/Basic/SupplementaryOutputPaths.h

@@ -31,6 +31,17 @@ struct SupplementaryOutputPaths {
   /// \sa swift::printAsObjC
   std::string ObjCHeaderOutputPath;
 
+  /// The path to which we should emit a C++ header for the module.
+  ///
+  /// Currently only makes sense when the compiler has whole module knowledge.
+  /// The modes for which it makes sense include both WMO and the "merge
+  /// modules" job that happens after the normal compilation jobs. That's where
+  /// the header is emitted in single-file mode, since it needs whole-module
+  /// information.
+  ///
+  /// \sa swift::printAsCXX
+  std::string CxxHeaderOutputPath;
+
   /// The path to which we should emit a serialized module.
   /// It is valid whenever there are any inputs.
   ///
@@ -160,7 +171,9 @@ struct SupplementaryOutputPaths {
   /// Apply a given function for each existing (non-empty string) supplementary output
   void forEachSetOutput(llvm::function_ref<void(const std::string&)> fn) const {
     if (!ObjCHeaderOutputPath.empty())
-      fn(ObjCHeaderOutputPath); 
+      fn(ObjCHeaderOutputPath);
+    if (!CxxHeaderOutputPath.empty())
+      fn(CxxHeaderOutputPath);
     if (!ModuleOutputPath.empty())
       fn(ModuleOutputPath); 
     if (!ModuleSourceInfoOutputPath.empty())
@@ -196,14 +209,16 @@ struct SupplementaryOutputPaths {
   }
 
   bool empty() const {
-    return ObjCHeaderOutputPath.empty() && ModuleOutputPath.empty() &&
-           ModuleDocOutputPath.empty() && DependenciesFilePath.empty() &&
+    return ObjCHeaderOutputPath.empty() && CxxHeaderOutputPath.empty() &&
+           ModuleOutputPath.empty() && ModuleDocOutputPath.empty() &&
+           DependenciesFilePath.empty() &&
            ReferenceDependenciesFilePath.empty() &&
            SerializedDiagnosticsPath.empty() && LoadedModuleTracePath.empty() &&
            TBDPath.empty() && ModuleInterfaceOutputPath.empty() &&
-           ModuleSourceInfoOutputPath.empty() && ABIDescriptorOutputPath.empty() &&
-           ModuleSemanticInfoOutputPath.empty() &&
-           YAMLOptRecordPath.empty() && BitstreamOptRecordPath.empty();
+           ModuleSourceInfoOutputPath.empty() &&
+           ABIDescriptorOutputPath.empty() &&
+           ModuleSemanticInfoOutputPath.empty() && YAMLOptRecordPath.empty() &&
+           BitstreamOptRecordPath.empty();
   }
 };
 } // namespace swift

include/swift/ClangImporter/ClangModule.h

@@ -87,6 +87,8 @@ class ClangModuleUnit final : public LoadedFile {
          ObjCSelector selector,
          SmallVectorImpl<AbstractFunctionDecl *> &results) const override;
 
+  virtual bool shouldCollectDisplayDecls() const override;
+
   virtual void getTopLevelDecls(SmallVectorImpl<Decl*> &results) const override;
 
   virtual void getDisplayDecls(SmallVectorImpl<Decl*> &results) const override;