Swift: mangle remaining unmangled types appearing during test run

redsun82 · redsun82 · commit 2592129d83d3 · 2023-05-02T10:45:42.000+02:00
diff --git a/swift/extractor/mangler/SwiftMangler.cpp b/swift/extractor/mangler/SwiftMangler.cpp
@@ -160,6 +160,9 @@ SwiftMangledName SwiftMangler::visitBuiltinType(const swift::BuiltinType* type)
 SwiftMangledName SwiftMangler::visitAnyGenericType(const swift::AnyGenericType* type) {
   auto ret = initMangled(type);
   ret << dispatcher.fetchLabel(type->getDecl());
+  if (auto parent = type->getParent()) {
+    ret << dispatcher.fetchLabel(parent);
+  }
   return ret;
 }
 
@@ -284,6 +287,9 @@ SwiftMangledName SwiftMangler::visitDictionaryType(const swift::DictionaryType*
 SwiftMangledName SwiftMangler::visitTypeAliasType(const swift::TypeAliasType* type) {
   auto ret = initMangled(type);
   ret << dispatcher.fetchLabel(type->getDecl());
+  for (auto replacement : type->getSubstitutionMap().getReplacementTypes()) {
+    ret << dispatcher.fetchLabel(replacement);
+  }
   return ret;
 }
 
@@ -293,3 +299,45 @@ SwiftMangledName SwiftMangler::visitArchetypeType(const swift::ArchetypeType* ty
   ret << dispatcher.fetchLabel(type->getInterfaceType());
   return ret;
 }
+
+SwiftMangledName SwiftMangler::visitProtocolCompositionType(
+    const swift::ProtocolCompositionType* type) {
+  auto ret = initMangled(type);
+  for (auto composed : type->getMembers()) {
+    ret << dispatcher.fetchLabel(composed);
+  }
+  if (type->hasExplicitAnyObject()) {
+    ret << "&AnyObject";
+  }
+  return ret;
+}
+
+SwiftMangledName SwiftMangler::visitParenType(const swift::ParenType* type) {
+  auto ret = initMangled(type);
+  ret << dispatcher.fetchLabel(type->getUnderlyingType());
+  return ret;
+}
+
+SwiftMangledName SwiftMangler::visitLValueType(const swift::LValueType* type) {
+  auto ret = initMangled(type);
+  ret << dispatcher.fetchLabel(type->getObjectType());
+  return ret;
+}
+
+SwiftMangledName SwiftMangler::visitDynamicSelfType(const swift::DynamicSelfType* type) {
+  auto ret = initMangled(type);
+  ret << dispatcher.fetchLabel(type->getSelfType());
+  return ret;
+}
+
+SwiftMangledName SwiftMangler::visitUnboundGenericType(const swift::UnboundGenericType* type) {
+  auto ret = initMangled(type);
+  ret << dispatcher.fetchLabel(type->getDecl());
+  return ret;
+}
+
+SwiftMangledName SwiftMangler::visitReferenceStorageType(const swift::ReferenceStorageType* type) {
+  auto ret = initMangled(type);
+  ret << dispatcher.fetchLabel(type->getReferentType());
+  return ret;
+}
diff --git a/swift/extractor/mangler/SwiftMangler.h b/swift/extractor/mangler/SwiftMangler.h
@@ -79,6 +79,12 @@ class SwiftMangler : private swift::TypeVisitor<SwiftMangler, SwiftMangledName>,
   SwiftMangledName visitDictionaryType(const swift::DictionaryType* type);
   SwiftMangledName visitTypeAliasType(const swift::TypeAliasType* type);
   SwiftMangledName visitArchetypeType(const swift::ArchetypeType* type);
+  SwiftMangledName visitProtocolCompositionType(const swift::ProtocolCompositionType* type);
+  SwiftMangledName visitParenType(const swift::ParenType* type);
+  SwiftMangledName visitLValueType(const swift::LValueType* type);
+  SwiftMangledName visitDynamicSelfType(const swift::DynamicSelfType* type);
+  SwiftMangledName visitUnboundGenericType(const swift::UnboundGenericType* type);
+  SwiftMangledName visitReferenceStorageType(const swift::ReferenceStorageType* type);
 
  private:
   static SwiftMangledName initMangled(const swift::TypeBase* type);
diff --git a/swift/integration-tests/posix-only/deduplication/DB-CHECK.expected b/swift/integration-tests/posix-only/deduplication/DB-CHECK.expected
