Merge remote-tracking branch 'origin/master' into master-rebranch

Author: swift-ci

lib/AST/ASTDemangler.cpp

@@ -32,6 +32,7 @@
 #include "swift/AST/Types.h"
 #include "swift/Demangling/Demangler.h"
 #include "swift/Demangling/ManglingMacros.h"
+#include "llvm/ADT/StringSwitch.h"
 
 using namespace swift;
 
@@ -838,22 +839,45 @@ CanGenericSignature ASTBuilder::demangleGenericSignature(
       break;
     }
     case Demangle::Node::Kind::DependentGenericLayoutRequirement: {
-      // FIXME: Other layout constraints
-      LayoutConstraint constraint;
       auto kindChild = child->getChild(1);
       if (kindChild->getKind() != Demangle::Node::Kind::Identifier)
         return CanGenericSignature();
 
-      if (kindChild->getText() == "C") {
-        auto kind = LayoutConstraintKind::Class;
-        auto layout = LayoutConstraint::getLayoutConstraint(kind, Ctx);
-        builder.addRequirement(
-            Requirement(RequirementKind::Layout, subjectType, layout),
-            source, nullptr);
-        break;
+      auto kind = llvm::StringSwitch<Optional<
+          LayoutConstraintKind>>(kindChild->getText())
+        .Case("U", LayoutConstraintKind::UnknownLayout)
+        .Case("R", LayoutConstraintKind::RefCountedObject)
+        .Case("N", LayoutConstraintKind::NativeRefCountedObject)
+        .Case("C", LayoutConstraintKind::Class)
+        .Case("D", LayoutConstraintKind::NativeClass)
+        .Case("T", LayoutConstraintKind::Trivial)
+        .Cases("E", "e", LayoutConstraintKind::TrivialOfExactSize)
+        .Cases("M", "m", LayoutConstraintKind::TrivialOfAtMostSize)
+        .Default(None);
+
+      if (!kind)
+        return CanGenericSignature();
+
+      LayoutConstraint layout;
+
+      if (kind != LayoutConstraintKind::TrivialOfExactSize &&
+          kind != LayoutConstraintKind::TrivialOfAtMostSize) {
+        layout = LayoutConstraint::getLayoutConstraint(*kind, Ctx);
+      } else {
+        auto size = child->getChild(2)->getIndex();
+        auto alignment = 0;
+
+        if (child->getNumChildren() == 4)
+          alignment = child->getChild(3)->getIndex();
+
+        layout = LayoutConstraint::getLayoutConstraint(*kind, size, alignment,
+                                                       Ctx);
       }
 
-      return CanGenericSignature();
+      builder.addRequirement(
+          Requirement(RequirementKind::Layout, subjectType, layout),
+          source, nullptr);
+      break;
     }
     default:
       return CanGenericSignature();

test/TypeDecoder/extensions.swift

@@ -42,4 +42,19 @@ extension Generic where T == Int {
 // CHECK-DECL: extensions.(file).Generic extension.Nested1
 
 // DEMANGLE-DECL: $s10extensions7GenericVAASiRszlE7Nested2V
-// CHECK-DECL: extensions.(file).Generic extension.Nested2
+// CHECK-DECL: extensions.(file).Generic extension.Nested2
+
+// Layout Constraints
+// FIXME: When other layout constraints are allowed in source level swift, test
+// that we correctly demangle those as well.
+
+extension Generic where T: AnyObject {
+  struct NestedViaAnyObject {}
+}
+
+// DEMANGLE-TYPE: $s10extensions7GenericVAARlzClE18NestedViaAnyObjectVyx_GD
+// CHECK-TYPE: Generic<τ_0_0>.NestedViaAnyObject
+
+// DEMANGLE-DECL: $s10extensions7GenericVAARlzClE18NestedViaAnyObjectV
+// CHECK-DECL: extensions.(file).Generic extension.NestedViaAnyObject
+