Runtime: Fix shape requirement handling in _checkGenericRequirements()

We would say the shape requirement was always satisfied since we
incorrectly checked the left-hand side type twice.

Author: slavapestov

include/swift/ABI/GenericContext.h

@@ -183,10 +183,11 @@ class TargetGenericRequirementDescriptor {
     return offsetof(typename std::remove_reference<decltype(*this)>::type, Param);
   }
 
-  /// Retrieve the right-hand type for a SameType or BaseClass requirement.
+  /// Retrieve the right-hand type for a SameType, BaseClass or SameShape requirement.
   llvm::StringRef getMangledTypeName() const {
     assert(getKind() == GenericRequirementKind::SameType ||
-           getKind() == GenericRequirementKind::BaseClass);
+           getKind() == GenericRequirementKind::BaseClass ||
+           getKind() == GenericRequirementKind::SameShape);
     return swift::Demangle::makeSymbolicMangledNameStringRef(Type.get());
   }
 

stdlib/public/runtime/ProtocolConformance.cpp

@@ -1539,7 +1539,7 @@ checkGenericPackRequirement(const GenericRequirementDescriptor &req,
 
   case GenericRequirementKind::SameShape: {
     auto result = swift::getTypePackByMangledName(
-        req.getParam(), extraArguments.data(),
+        req.getMangledTypeName(), extraArguments.data(),
         substGenericParam, substWitnessTable);
     if (result.getError())
       return *result.getError();

test/Interpreter/variadic_generic_conditional_conformances.swift

@@ -59,4 +59,23 @@ conformances.test("cast") {
   expectEqual(false, cast(G<Bool, Int>(), to: (any P).self))
 }
 
+struct Outer<each U> {
+  struct Inner<each V> {}
+}
+
+extension Outer.Inner: P where repeat (repeat (each U, each V)): Any {
+  static func foobar() -> [String] {
+    return ["hello"]
+  }
+}
+
+conformances.test("shape") {
+  expectEqual(true, cast(Outer< >.Inner< >(), to: (any P).self))
+  expectEqual(true, cast(Outer<Int>.Inner<Bool>(), to: (any P).self))
+  expectEqual(true, cast(Outer<Int, String>.Inner<Bool, Float>(), to: (any P).self))
+
+  expectEqual(false, cast(Outer<Bool>.Inner< >(), to: (any P).self))
+  expectEqual(false, cast(Outer<Int, Bool>.Inner<String, Float, Character>(), to: (any P).self))
+}
+
 runAllTests()