Merge pull request #18578 from jckarter/dont-verify-roundtripping-private-types

 Runtime: Don't attempt to round-trip mangled names for private types.

Author: jckarter

stdlib/public/runtime/Demangle.cpp

@@ -226,8 +226,8 @@ swift::_buildDemanglingForContext(const ContextDescriptor *context,
       // no richer runtime information available about it (such as an anonymous
       // context). Use an unstable mangling to represent the context by its
       // pointer identity.
-      char addressBuf[sizeof(void*) * 2 + 2 + 1];
-      snprintf(addressBuf, sizeof(addressBuf), "0x%" PRIxPTR, (uintptr_t)component);
+      char addressBuf[sizeof(void*) * 2 + 1 + 1];
+      snprintf(addressBuf, sizeof(addressBuf), "$%" PRIxPTR, (uintptr_t)component);
 
       auto anonNode = Dem.createNode(Node::Kind::AnonymousContext);
       CharVector addressStr;

stdlib/public/runtime/Metadata.cpp

@@ -4196,6 +4196,16 @@ bool Metadata::satisfiesClassConstraint() const {
 }
 
 #if !NDEBUG
+static bool referencesAnonymousContext(Demangle::Node *node) {
+  if (node->getKind() == Demangle::Node::Kind::AnonymousContext)
+    return true;
+  for (unsigned i = 0, e = node->getNumChildren(); i < e; ++i)
+    if (referencesAnonymousContext(node->getChild(i)))
+      return true;
+
+  return false;
+}
+
 void swift::verifyMangledNameRoundtrip(const Metadata *metadata) {
   // Enable verification when a special environment variable is set.
   // Some metatypes crash when going through the mangler or demangler. A
@@ -4211,12 +4221,17 @@ void swift::verifyMangledNameRoundtrip(const Metadata *metadata) {
 
   Demangle::Demangler Dem;
   auto node = _swift_buildDemanglingForMetadata(metadata, Dem);
+  // If the mangled node involves types in an AnonymousContext, then by design,
+  // it cannot be looked up by name.
+  if (referencesAnonymousContext(node))
+    return;
+  
   auto mangledName = Demangle::mangleNode(node);
   auto result = _getTypeByMangledName(mangledName,
                                       [](unsigned, unsigned){ return nullptr; });
   if (metadata != result)
     swift::warning(RuntimeErrorFlagNone,
-                   "Metadata mangled name failed to roundtrip: %p -> %s -> %p",
+                   "Metadata mangled name failed to roundtrip: %p -> %s -> %p\n",
                    metadata, mangledName.c_str(), (const Metadata *)result);
 }
 #endif