IRGen: Fix emitPackShapeExpression() with empty pack

slavapestov · slavapestov · commit aa8f87a768ee · 2023-02-25T16:19:07.000-05:00
diff --git a/lib/IRGen/GenPack.cpp b/lib/IRGen/GenPack.cpp
@@ -161,6 +161,8 @@ llvm::Value *IRGenFunction::emitPackShapeExpression(CanType type) {
   if (pair.first > 0) {
     auto *constant = llvm::ConstantInt::get(IGM.SizeTy, pair.first);
     accumulateSum(*this, pair.second, constant);
+  } else if (pair.second == nullptr) {
+    pair.second = llvm::ConstantInt::get(IGM.SizeTy, 0);
   }
 
   setScopedLocalTypeData(type, kind, pair.second);
diff --git a/test/Interpreter/variadic_generic_types.swift b/test/Interpreter/variadic_generic_types.swift
@@ -11,5 +11,8 @@ struct G<T...> {
   }
 }
 
+// CHECK: ()
+G< >().makeTuple()
+
 // CHECK: (Array<Int>, Array<String>, Array<Float>)
 G<Int, String, Float>().makeTuple()

Original file line number	Diff line number	Diff line change
`@@ -161,6 +161,8 @@ llvm::Value *IRGenFunction::emitPackShapeExpression(CanType type) {`
`161`	`161`	`if (pair.first > 0) {`
`162`	`162`	`auto *constant = llvm::ConstantInt::get(IGM.SizeTy, pair.first);`
`163`	`163`	`accumulateSum(*this, pair.second, constant);`
	`164`	`+ } else if (pair.second == nullptr) {`
	`165`	`+ pair.second = llvm::ConstantInt::get(IGM.SizeTy, 0);`
`164`	`166`	`}`
`165`	`167`
`166`	`168`	`setScopedLocalTypeData(type, kind, pair.second);`
Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,8 @@ struct G<T...> {`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`
	`14`	`+// CHECK: ()`
	`15`	`+G< >().makeTuple()`
	`16`	`+`
`14`	`17`	`// CHECK: (Array<Int>, Array<String>, Array<Float>)`
`15`	`18`	`G<Int, String, Float>().makeTuple()`