Fix variadic arguments in keypath subscripts

Author: zoecarver

lib/SIL/SILInstructions.cpp

@@ -2242,6 +2242,7 @@ KeyPathPattern::get(SILModule &M, CanGenericSignature signature,
     case KeyPathPatternComponent::Kind::GettableProperty:
     case KeyPathPatternComponent::Kind::SettableProperty:
       for (auto &index : component.getSubscriptIndices()) {
+        index.FormalType.dump();
         maxOperandNo = std::max(maxOperandNo, (int)index.Operand);
       }
     }

lib/SILGen/SILGenExpr.cpp

@@ -52,6 +52,8 @@
 
 #include "swift/AST/DiagnosticsSIL.h"
 
+#include <iostream>
+
 using namespace swift;
 using namespace Lowering;
 
@@ -3067,6 +3069,11 @@ getOrCreateKeyPathEqualsAndHash(SILGenModule &SGM,
                                                            hashable);
       auto formalCanTy = formalTy->getCanonicalType(genericSig);
 
+      formalTy.dump();
+      index.FormalType.dump();
+      equatableProtocol->dump();
+      hashable.dump();
+      
       // Get the Equatable conformance from the Hashable conformance.
       auto equatable = hashable.getAssociatedConformance(formalTy,
         GenericTypeParamType::get(0, 0, C),
@@ -3342,23 +3349,71 @@ lowerKeyPathSubscriptIndexTypes(
 };
 
 static void
-lowerKeyPathSubscriptIndexPatterns(
+lowerKeyPathSubscriptEqualsIndexPatterns(
                  SmallVectorImpl<KeyPathPatternComponent::Index> &indexPatterns,
                  ArrayRef<IndexTypePair> indexTypes,
                  ArrayRef<ProtocolConformanceRef> indexHashables,
-                 unsigned &baseOperand) {
+                 unsigned baseOperand,
+                 SILGenModule &SGM,
+                 ResilienceExpansion expansion) {
   for (unsigned i : indices(indexTypes)) {
     CanType formalTy;
     SILType loweredTy;
     std::tie(formalTy, loweredTy) = indexTypes[i];
     auto hashable = indexHashables[i].mapConformanceOutOfContext();
+    // TODO: this only works if varaidic parameters must come last
+    // We have an array of variadic parameters...
+    if (!hashable.getConcrete()->getType()->isEqual(formalTy)) {
+      // Add all the hashable types
+      auto arrayTy = cast<BoundGenericStructType>(formalTy.getPointer());
+      auto elementTy = arrayTy->getGenericArgs()[0];
+//      for (unsigned hashableIndex = i; hashableIndex < indexHashables.size(); ++hashableIndex);
+      
+      assert(indexTypes.size() == indexHashables.size());
+      
+      assert(hashable.getConcrete()->getType()->isEqual(elementTy));
+      auto newLoweredTy = SGM.Types.getLoweredType(
+          AbstractionPattern::getOpaque(), elementTy,
+          TypeExpansionContext::noOpaqueTypeArchetypesSubstitution(expansion));
+      newLoweredTy = newLoweredTy.mapTypeOutOfContext();
+      auto newFormalTy = elementTy->mapTypeOutOfContext()
+                                  ->getCanonicalType();
+      
+      std::cout << "lowered variadic arg formal type: " << std::endl;
+      newFormalTy.dump();
+      loweredTy.dump();
+      
+      indexPatterns.push_back({baseOperand++, newFormalTy,
+                               newLoweredTy, hashable});
+      break;
+    }
+//    hashable.dump(); // Int
+//    hashable.getConcrete()->getType().dump(); // Int
+//    formalTy.dump(); // Array<Int>
+//    loweredTy.dump(); // $Array<Int>
     assert(hashable.isAbstract() ||
            hashable.getConcrete()->getType()->isEqual(formalTy));
 
     indexPatterns.push_back({baseOperand++, formalTy, loweredTy, hashable});
   }
 };
 
+static void
+lowerKeyPathSubscriptIndexPatterns(
+                 SmallVectorImpl<KeyPathPatternComponent::Index> &indexPatterns,
+                 ArrayRef<IndexTypePair> indexTypes,
+                 ArrayRef<ProtocolConformanceRef> indexHashables,
+                 unsigned &baseOperand) {
+  for (unsigned i : indices(indexTypes)) {
+    CanType formalTy;
+    SILType loweredTy;
+    std::tie(formalTy, loweredTy) = indexTypes[i];
+    auto hashable = indexHashables[i].mapConformanceOutOfContext();
+
+    indexPatterns.push_back({baseOperand++, formalTy, loweredTy, hashable});
+  }
+};
+
 KeyPathPatternComponent
 SILGenModule::emitKeyPathComponentForDecl(SILLocation loc,
                                 GenericEnvironment *genericEnv,
@@ -3500,18 +3555,22 @@ SILGenModule::emitKeyPathComponentForDecl(SILLocation loc,
                                     expansion,
                                     needsGenericContext);
 
-    SmallVector<KeyPathPatternComponent::Index, 4> indexPatterns;
+    SmallVector<KeyPathPatternComponent::Index, 4> equalsIndexPatterns;
+    SmallVector<KeyPathPatternComponent::Index, 4> xIndexPatterns;
     SILFunction *indexEquals = nullptr, *indexHash = nullptr;
     // Property descriptors get their index information from the client.
     if (!forPropertyDescriptor) {
-      lowerKeyPathSubscriptIndexPatterns(indexPatterns,
+      lowerKeyPathSubscriptEqualsIndexPatterns(equalsIndexPatterns,
+                                               indexTypes, indexHashables,
+                                               baseOperand, *this, expansion);
+      lowerKeyPathSubscriptIndexPatterns(xIndexPatterns,
                                          indexTypes, indexHashables,
                                          baseOperand);
 
       getOrCreateKeyPathEqualsAndHash(*this, loc,
                needsGenericContext ? genericEnv : nullptr,
                expansion,
-               indexPatterns,
+               equalsIndexPatterns,
                indexEquals, indexHash);
     }
 
@@ -3523,7 +3582,7 @@ SILGenModule::emitKeyPathComponentForDecl(SILLocation loc,
              indexTypes,
              baseTy, componentTy);
 
-    auto indexPatternsCopy = getASTContext().AllocateCopy(indexPatterns);
+    auto indexPatternsCopy = getASTContext().AllocateCopy(xIndexPatterns);
     if (isSettableInComponent()) {
       auto setter = getOrCreateKeyPathSetter(*this, loc,
              decl, subs,
@@ -3540,6 +3599,13 @@ SILGenModule::emitKeyPathComponentForDecl(SILLocation loc,
                                                            externalSubs,
                                                            componentTy);
     } else {
+      for (auto &i : indexPatternsCopy) {
+        std::cout << "formal type: " << std::endl;
+        i.FormalType.dump();
+        std::cout << "lowered type: " << std::endl;
+        i.LoweredType.dump();
+        std::cout << std::endl;
+      }
       return KeyPathPatternComponent::forComputedGettableProperty(id,
                                                            getter,
                                                            indexPatternsCopy,
@@ -3581,7 +3647,10 @@ RValue RValueEmitter::visitKeyPathExpr(KeyPathExpr *E, SGFContext C) {
     case KeyPathExpr::Component::Kind::Property:
     case KeyPathExpr::Component::Kind::Subscript: {
       auto decl = cast<AbstractStorageDecl>(component.getDeclRef().getDecl());
-
+      
+      decl->dump();
+      component.getIndexExpr()->dump();
+      
       unsigned numOperands = operands.size();
       loweredComponents.push_back(
         SGF.SGM.emitKeyPathComponentForDecl(SILLocation(E),
@@ -3604,6 +3673,7 @@ RValue RValueEmitter::visitKeyPathExpr(KeyPathExpr *E, SGFContext C) {
           component.getIndexExpr());
 
       for (auto &arg : loweredArgs) {
+        arg.dump();
         operands.push_back(arg.forward(SGF));
       }
 
@@ -3674,6 +3744,9 @@ RValue RValueEmitter::visitKeyPathExpr(KeyPathExpr *E, SGFContext C) {
                                      rootTy, baseTy,
                                      loweredComponents,
                                      objcString);
+
+  std::cout << "[pattern] num operands: " << pattern->getNumOperands() << std::endl;
+  std::cout << "[operand] num operands: " << operands.size() << std::endl;
   auto keyPath = SGF.B.createKeyPath(SILLocation(E), pattern,
                                      needsGenericContext
                                        ? SGF.F.getForwardingSubstitutionMap()

lib/Sema/CSApply.cpp

@@ -4589,6 +4589,8 @@ namespace {
       auto fnType = overload.openedType->castTo<FunctionType>();
       SmallVector<Identifier, 4> newLabels;
       for (auto &param : fnType->getParams()) {
+        param.getParameterType().dump();
+        
         newLabels.push_back(param.getLabel());
 
         auto indexType = simplifyType(param.getPlainType());