IRGen: Stub out more support for type parameter packs

Author: slavapestov

lib/IRGen/GenProto.cpp

@@ -3409,10 +3409,16 @@ void irgen::bindFromGenericRequirementsBuffer(IRGenFunction &IGF,
     }
 
     // Cast if necessary.
-    if (requirements[index].isWitnessTable()) {
+    switch (requirements[index].getKind()) {
+    case GenericRequirement::Kind::Shape:
+      slot = IGF.Builder.CreateElementBitCast(slot, IGF.IGM.SizeTy);
+      break;
+    case GenericRequirement::Kind::Metadata:
+      slot = IGF.Builder.CreateElementBitCast(slot, IGF.IGM.TypeMetadataPtrTy);
+      break;
+    case GenericRequirement::Kind::WitnessTable:
       slot = IGF.Builder.CreateElementBitCast(slot, IGF.IGM.WitnessTablePtrTy);
-    } else {
-      assert(requirements[index].isMetadata());
+      break;
     }
 
     llvm::Value *value = IGF.Builder.CreateLoad(slot);

lib/IRGen/GenericArguments.h

@@ -64,11 +64,16 @@ struct GenericArguments {
   void collectTypes(IRGenModule &IGM,
                     const GenericTypeRequirements &requirements) {
     for (auto &requirement : requirements.getRequirements()) {
-      if (requirement.isWitnessTable()) {
-        Types.push_back(IGM.WitnessTablePtrTy);
-      } else {
-        assert(requirement.isMetadata());
+      switch (requirement.getKind()) {
+      case GenericRequirement::Kind::Shape:
+        Types.push_back(IGM.SizeTy);
+        break;
+      case GenericRequirement::Kind::Metadata:
         Types.push_back(IGM.TypeMetadataPtrTy);
+        break;
+      case GenericRequirement::Kind::WitnessTable:
+        Types.push_back(IGM.WitnessTablePtrTy);
+        break;
       }
     }
   }

lib/IRGen/MetadataRequest.cpp

@@ -2408,14 +2408,21 @@ MetadataResponse irgen::emitGenericTypeMetadataAccessFunction(
     IGM.setColocateMetadataSection(thunkFn);
 
     // Call out to the helper.
+    auto getNextParam = [&]() -> llvm::Value * {
+      auto *param = params.claimNext();
+      if (param->getType()->isPointerTy())
+        return IGF.Builder.CreateBitCast(param, IGM.Int8PtrTy);
+      return IGF.Builder.CreateIntToPtr(param, IGM.Int8PtrTy);
+    };
+
     auto arg0 = numArguments >= 1
-      ? IGF.Builder.CreateBitCast(params.claimNext(), IGM.Int8PtrTy)
+      ? getNextParam()
       : llvm::UndefValue::get(IGM.Int8PtrTy);
     auto arg1 = numArguments >= 2
-      ? IGF.Builder.CreateBitCast(params.claimNext(), IGM.Int8PtrTy)
+      ? getNextParam()
       : llvm::UndefValue::get(IGM.Int8PtrTy);
     auto arg2 = numArguments >= 3
-      ? IGF.Builder.CreateBitCast(params.claimNext(), IGM.Int8PtrTy)
+      ? getNextParam()
       : llvm::UndefValue::get(IGM.Int8PtrTy);
 
     llvm::CallInst *call;

test/IRGen/variadic_generic_types.swift

@@ -0,0 +1,19 @@
+// RUN: %target-swift-frontend -emit-ir -primary-file %s -enable-experimental-feature VariadicGenerics | %FileCheck %s
+
+// Because of -enable-experimental-feature VariadicGenerics
+// REQUIRES: asserts
+
+// REQUIRES: PTRSIZE=64
+
+struct G<T...> {
+  // CHECK-LABEL: define hidden swiftcc void @"$s22variadic_generic_types1GV6calleeyyF"(i64 %0, %swift.type* %T)
+  // CHECK: ret void
+  func callee() {}
+
+  // CHECK-LABEL: define hidden swiftcc void @"$s22variadic_generic_types1GV6calleryyF"(i64 %0, %swift.type* %T)
+  // CHECK: call swiftcc void @"$s22variadic_generic_types1GV6calleeyyF"(i64 %0, %swift.type* %T)
+  // CHECK: ret void
+  func caller() {
+    callee()
+  }
+}