Merge pull request #3765 from swiftwasm/main

[pull] swiftwasm from main

Author: pull[bot]

cmake/modules/SwiftUtils.cmake

@@ -207,7 +207,7 @@ endfunction()
 # Once swift-frontend is built, if the standalone (early) swift-driver has been built,
 # we create a `swift-driver` symlink adjacent to the `swift` and `swiftc` executables
 # to ensure that `swiftc` forwards to the standalone driver when invoked.
-function(swift_create_early_driver_symlinks target)
+function(swift_create_early_driver_copies target)
   # Early swift-driver is built adjacent to the compiler (swift build dir)
   set(driver_bin_dir "${CMAKE_BINARY_DIR}/../earlyswiftdriver-${SWIFT_HOST_VARIANT}-${SWIFT_HOST_VARIANT_ARCH}/release/bin")
   set(swift_bin_dir "${SWIFT_RUNTIME_OUTPUT_INTDIR}")
@@ -217,20 +217,18 @@ function(swift_create_early_driver_symlinks target)
       return()
   endif()
 
-  message(STATUS "Creating early SwiftDriver symlinks.")
+  message(STATUS "Copying over early SwiftDriver executable.")
   message(STATUS "From: ${driver_bin_dir}/swift-driver")
   message(STATUS "To: ${swift_bin_dir}/swift-driver")
-  swift_create_post_build_symlink(swift-frontend
-    SOURCE "${driver_bin_dir}/swift-driver"
-    DESTINATION "${swift_bin_dir}/swift-driver"
-    COMMENT "Creating early SwiftDriver symlinks: swift-driver")
+  # Use configure_file instead of file(COPY...) to establish a dependency.
+  # Further Changes to `swift-driver` will cause it to be copied over.
+  configure_file(${driver_bin_dir}/swift-driver ${swift_bin_dir}/swift-driver COPYONLY)
 
   message(STATUS "From: ${driver_bin_dir}/swift-help")
   message(STATUS "To: ${swift_bin_dir}/swift-help")
-  swift_create_post_build_symlink(swift-frontend
-    SOURCE "${driver_bin_dir}/swift-help"
-    DESTINATION "${swift_bin_dir}/swift-help"
-    COMMENT "Creating early SwiftDriver symlinks: swift-help")
+  # Use configure_file instead of file(COPY...) to establish a dependency.
+  # Further Changes to `swift-driver` will cause it to be copied over.  
+  configure_file(${driver_bin_dir}/swift-help ${swift_bin_dir}/swift-help COPYONLY)
 endfunction()
 
 function(dump_swift_vars)

include/swift/APIDigester/ModuleAnalyzerNodes.h

@@ -339,6 +339,7 @@ struct PlatformIntroVersion {
 class SDKNodeDecl: public SDKNode {
   DeclKind DKind;
   StringRef Usr;
+  StringRef MangledName;
   SourceLoc Loc;
   StringRef Location;
   StringRef ModuleName;
@@ -359,12 +360,13 @@ class SDKNodeDecl: public SDKNode {
   Optional<uint8_t> FixedBinaryOrder;
   PlatformIntroVersion introVersions;
   StringRef ObjCName;
-
+  mutable Optional<StringRef> demangledName;
 protected:
   SDKNodeDecl(SDKNodeInitInfo Info, SDKNodeKind Kind);
   virtual ~SDKNodeDecl() = default;
 public:
   StringRef getUsr() const { return Usr; }
+  StringRef getDemangledName() const;
   StringRef getLocation() const { return Location; }
   StringRef getModuleName() const {return ModuleName;}
   StringRef getHeaderName() const;
@@ -463,6 +465,7 @@ class SDKNodeType: public SDKNode {
 
 class SDKNodeTypeNominal : public SDKNodeType {
   StringRef USR;
+  StringRef MangledName;
 public:
   SDKNodeTypeNominal(SDKNodeInitInfo Info);
   // Get the usr of the corresponding nominal type decl.
@@ -583,6 +586,7 @@ class SDKNodeDeclType: public SDKNodeDecl {
 /// in the conformance, thus getName() will give us the name of the protocol.
 class SDKNodeConformance: public SDKNode {
   StringRef Usr;
+  StringRef MangledName;
   SDKNodeDeclType *TypeDecl;
   friend class SDKNodeDeclType;
   bool IsABIPlaceholder;

include/swift/AST/ASTMangler.h

@@ -271,6 +271,7 @@ class ASTMangler : public Mangler {
 
   std::string mangleTypeAsContextUSR(const NominalTypeDecl *type);
 
+  std::string mangleAnyDecl(const ValueDecl *Decl, bool prefix);
   std::string mangleDeclAsUSR(const ValueDecl *Decl, StringRef USRPrefix);
 
   std::string mangleAccessorEntityAsUSR(AccessorKind kind,

include/swift/AST/Builtins.def

@@ -642,6 +642,9 @@ BUILTIN_MISC_OPERATION(StaticReport, "staticReport", "", Special)
 /// Returns the selected assertion configuration.
 BUILTIN_MISC_OPERATION(AssertConf, "assert_configuration", "n", Special)
 
+/// Ifdef has type () -> Bool.
+BUILTIN_MISC_OPERATION(Ifdef, "ifdef", "n", Special)
+
 /// StringObjectOr has type (T,T) -> T.
 /// Sets bits in a string object. The first operand is bit-cast string literal
 /// pointer to an integer. The second operand is the bit mask to be or'd into
@@ -734,10 +737,6 @@ BUILTIN_MISC_OPERATION(DestroyDefaultActor, "destroyDefaultActor", "", Special)
 BUILTIN_MISC_OPERATION(InitializeDistributedRemoteActor,
                        "initializeDistributedRemoteActor", "", Special)
 
-/// Destroy the distributed-actor instance in a "proxy" actor object.
-BUILTIN_MISC_OPERATION(DestroyDistributedActor,
-                       "destroyDistributedActor", "", Special)
-
 /// Resume a non-throwing continuation normally with the given result.
 BUILTIN_MISC_OPERATION(ResumeNonThrowingContinuationReturning,
                        "resumeNonThrowingContinuationReturning", "", Special)

include/swift/AST/SILOptions.h

@@ -192,6 +192,9 @@ class SILOptions {
   /// }
   bool EnableDynamicReplacementCanCallPreviousImplementation = true;
 
+  /// Are we parsing the stdlib, i.e. -parse-stdlib?
+  bool ParseStdlib = false;
+
   /// The name of the file to which the backend should save optimization
   /// records.
   std::string OptRecordFile;

include/swift/AST/USRGeneration.h

@@ -63,8 +63,11 @@ bool printExtensionUSR(const ExtensionDecl *ED, raw_ostream &OS);
 /// \returns true if it failed, false on success.
 bool printDeclUSR(const Decl *D, raw_ostream &OS);
 
-/// Demangle a mangle-name-based USR to a human readable name.
-std::string demangleUSR(StringRef mangled);
+/// Get mangled name from a USR.
+std::string getMangledNameFromUSR(StringRef usr);
+
+/// Demangle a mangled name to a human readable name.
+std::string demangleMangledName(StringRef mangled);
 
 } // namespace ide
 } // namespace swift