Merge pull request #5163 from swiftwasm/release/5.8

[pull] swiftwasm-release/5.8 from release/5.8

Author: kateinoigakukun

CMakeLists.txt

@@ -1193,8 +1193,8 @@ else()
     add_subdirectory(stdlib/public/BackDeployConcurrency)
   endif()
 
-  # Some tools (e.g. swift-reflection-dump) rely on a host swiftReflection, so
-  # ensure we build that when building tools.
+  # Some tools (e.g. swift-reflection-dump) rely on a host swiftRemoteInspection,
+  # so ensure we build that when building tools.
   if(SWIFT_INCLUDE_TOOLS)
     add_subdirectory(stdlib/public/SwiftShims/swift/shims)
   endif()

include/swift/Basic/Mangler.h

@@ -54,6 +54,12 @@ class Mangler {
 
   /// Identifier substitutions.
   llvm::StringMap<unsigned> StringSubstitutions;
+  
+  /// Index to use for the next added substitution.
+  /// Note that this is not simply the sum of the size of the \c Substitutions
+  /// and \c StringSubstitutions maps above, since in some circumstances the
+  /// same entity may be registered for multiple substitution indexes.
+  unsigned NextSubstitutionIndex = 0;
 
   /// Word substitutions in mangled identifiers.
   llvm::SmallVector<SubstitutionWord, 26> Words;
@@ -102,7 +108,6 @@ class Mangler {
   }
 
 protected:
-
   Mangler() : Buffer(Storage) { }
 
   /// Begins a new mangling but does not add the mangling prefix.
@@ -134,15 +139,15 @@ class Mangler {
   void addSubstitution(const void *ptr) {
     if (!UseSubstitutions)
       return;
-
-    auto value = Substitutions.size() + StringSubstitutions.size();
+    
+    auto value = NextSubstitutionIndex++;
     Substitutions[ptr] = value;
   }
   void addSubstitution(StringRef Str) {
     if (!UseSubstitutions)
       return;
 
-    auto value = Substitutions.size() + StringSubstitutions.size();
+    auto value = NextSubstitutionIndex++;
     StringSubstitutions[Str] = value;
   }
 

include/swift/Demangling/DemangleNodes.def

@@ -339,7 +339,6 @@ NODE(AccessibleFunctionRecord)
 NODE(CompileTimeConst)
 
 // Added in Swift 5.7
-NODE(OpaqueReturnTypeIndexed)
 NODE(BackDeploymentThunk)
 NODE(BackDeploymentFallback)
 NODE(ExtendedExistentialTypeShape)
@@ -351,6 +350,8 @@ NODE(SymbolicExtendedExistentialType)
 // Added in Swift 5.8
 NODE(MetatypeParamsRemoved)
 NODE(HasSymbolQuery)
+NODE(OpaqueReturnTypeIndex)
+NODE(OpaqueReturnTypeParent)
 
 #undef CONTEXT_NODE
 #undef NODE

include/swift/Demangling/Demangler.h

@@ -475,8 +475,9 @@ class Demangler : public NodeFactory {
   friend DemangleInitRAII;
 
   void addSubstitution(NodePointer Nd) {
-    if (Nd)
+    if (Nd) {
       Substitutions.push_back(Nd, *this);
+    }
   }
 
   NodePointer addChild(NodePointer Parent, NodePointer Child);

include/swift/Reflection/MetadataSource.h renamed to include/swift/RemoteInspection/MetadataSource.h

@@ -36,7 +36,7 @@ namespace reflection {
 
 enum class MetadataSourceKind {
 #define METADATA_SOURCE(Id, Parent) Id,
-#include "swift/Reflection/MetadataSources.def"
+#include "swift/RemoteInspection/MetadataSources.def"
 #undef METADATA_SOURCE
 };
 
@@ -344,7 +344,7 @@ class MetadataSourceVisitor {
       return static_cast<ImplClass*>(this) \
         ->visit##Id##MetadataSource(cast<Id##MetadataSource>(MS), \
                            ::std::forward<Args>(args)...);
-#include "swift/Reflection/MetadataSources.def"
+#include "swift/RemoteInspection/MetadataSources.def"
     }
   }
 };

include/swift/Reflection/MetadataSourceBuilder.h renamed to include/swift/RemoteInspection/MetadataSourceBuilder.h

@@ -17,7 +17,7 @@
 #ifndef SWIFT_REFLECTION_METADATASOURCEBUILDER_H
 #define SWIFT_REFLECTION_METADATASOURCEBUILDER_H
 
-#include "swift/Reflection/MetadataSource.h"
+#include "swift/RemoteInspection/MetadataSource.h"
 
 namespace swift {
 namespace reflection {

include/swift/Reflection/MetadataSources.def renamed to include/swift/RemoteInspection/MetadataSources.def

@@ -30,11 +30,11 @@
 #include "swift/Concurrency/Actor.h"
 #include "swift/Remote/MemoryReader.h"
 #include "swift/Remote/MetadataReader.h"
-#include "swift/Reflection/Records.h"
-#include "swift/Reflection/RuntimeInternals.h"
-#include "swift/Reflection/TypeLowering.h"
-#include "swift/Reflection/TypeRef.h"
-#include "swift/Reflection/TypeRefBuilder.h"
+#include "swift/RemoteInspection/Records.h"
+#include "swift/RemoteInspection/RuntimeInternals.h"
+#include "swift/RemoteInspection/TypeLowering.h"
+#include "swift/RemoteInspection/TypeRef.h"
+#include "swift/RemoteInspection/TypeRefBuilder.h"
 #include "swift/Basic/Unreachable.h"
 
 #include <set>