Demangler: fix demangling any ~Copyable

Author: kavon

lib/AST/ASTDemangler.cpp

@@ -755,47 +755,54 @@ Type ASTBuilder::createExistentialMetatypeType(
 Type ASTBuilder::createConstrainedExistentialType(
     Type base, ArrayRef<BuiltRequirement> constraints,
     ArrayRef<BuiltInverseRequirement> inverseRequirements) {
-  // FIXME: Generalize to other kinds of bases.
-  if (!base->getAs<ProtocolType>())
-    return Type();
-  auto baseTy = base->castTo<ProtocolType>();
-  auto baseDecl = baseTy->getDecl();
-  llvm::SmallDenseMap<Identifier, Type> cmap;
-  for (const auto &req : constraints) {
-    switch (req.getKind()) {
-    case RequirementKind::SameShape:
-      llvm_unreachable("Same-shape requirement not supported here");
-    case RequirementKind::Conformance:
-    case RequirementKind::Superclass:
-    case RequirementKind::Layout:
-      continue;
+  Type constrainedBase;
+
+  if (auto baseTy = base->getAs<ProtocolType>()) {
+    auto baseDecl = baseTy->getDecl();
+    llvm::SmallDenseMap<Identifier, Type> cmap;
+    for (const auto &req : constraints) {
+      switch (req.getKind()) {
+      case RequirementKind::SameShape:
+        llvm_unreachable("Same-shape requirement not supported here");
+      case RequirementKind::Conformance:
+      case RequirementKind::Superclass:
+      case RequirementKind::Layout:
+        continue;
 
-    case RequirementKind::SameType:
-      if (auto *DMT = req.getFirstType()->getAs<DependentMemberType>())
-        cmap[DMT->getName()] = req.getSecondType();
+      case RequirementKind::SameType:
+        if (auto *DMT = req.getFirstType()->getAs<DependentMemberType>())
+          cmap[DMT->getName()] = req.getSecondType();
+      }
     }
-  }
-  llvm::SmallVector<Type, 4> args;
-  for (auto *assocTy : baseDecl->getPrimaryAssociatedTypes()) {
-    auto argTy = cmap.find(assocTy->getName());
-    if (argTy == cmap.end()) {
-      return Type();
+    llvm::SmallVector<Type, 4> args;
+    for (auto *assocTy : baseDecl->getPrimaryAssociatedTypes()) {
+      auto argTy = cmap.find(assocTy->getName());
+      if (argTy == cmap.end()) {
+        return Type();
+      }
+      args.push_back(argTy->getSecond());
     }
-    args.push_back(argTy->getSecond());
-  }
-
-  Type constrainedBase;
 
-  // We may not have any arguments because the constrained existential is a
-  // plain protocol with an inverse requirement.
-  if (args.empty()) {
-    constrainedBase =
-        ProtocolType::get(baseDecl, baseTy, base->getASTContext());
+    // We may not have any arguments because the constrained existential is a
+    // plain protocol with an inverse requirement.
+    if (args.empty()) {
+      constrainedBase =
+          ProtocolType::get(baseDecl, baseTy, base->getASTContext());
+    } else {
+      constrainedBase =
+          ParameterizedProtocolType::get(base->getASTContext(), baseTy, args);
+    }
+  } else if (base->isAny()) {
+    // The only other case should be that we got an empty PCT, which is equal to
+    // the Any type. The other constraints should have been encoded in the
+    // existential's generic signature (and arrive as BuiltInverseRequirement).
+    constrainedBase = base;
   } else {
-    constrainedBase =
-        ParameterizedProtocolType::get(base->getASTContext(), baseTy, args);
+    return Type();
   }
 
+  assert(constrainedBase);
+
   // Handle inverse requirements.
   if (!inverseRequirements.empty()) {
     InvertibleProtocolSet inverseSet;

test/TypeDecoder/constrained_existentials.swift

@@ -5,6 +5,7 @@
 // RUN: %lldb-moduleimport-test %t/constrained_existentials -type-from-mangled=%t/input | %FileCheck %s --match-full-lines
 
 func blackHole(_: Any...) {}
+func blackHole_noncopyable(_: consuming any ~Copyable) {}
 
 protocol BaseProto<A, B> {
   associatedtype A
@@ -43,3 +44,16 @@ do {
 
   blackHole(e0, e1, e2)
 }
+
+protocol NCProto: ~Copyable {}
+struct NC: ~Copyable {}
+struct GenNC<T: ~Copyable>: ~Copyable, NCProto {}
+
+do {
+  let e0: any NCProto & ~Copyable = GenNC<NC>()
+  let e1: any NCProto & ~Copyable = GenNC<String>()
+
+  // FIXME: breaks the MoveChecker (rdar://129885532)
+//   blackHole_noncopyable(consume e0)
+//   blackHole_noncopyable(consume e1)
+}