[CMake] Instantiate missing C++ templates

rintaro · rintaro · commit 71f5b472c8eb · 2023-08-30T23:31:38.000Z
diff --git a/lib/SILOptimizer/Utils/BasicBlockOptUtils.cpp b/lib/SILOptimizer/Utils/BasicBlockOptUtils.cpp
@@ -367,3 +367,12 @@ StaticInitCloner::clone(SingleValueInstruction *initVal) {
   }
   return cast<SingleValueInstruction>(getMappedValue(initVal));
 }
+
+// START: Workaround for C++ interop
+#include <tuple>
+template std::pair<SILInstruction *, SILInstruction *> std::make_pair<>(SILInstruction *&&, SILInstruction *&&);
+template std::pair<SILValue, SILInstruction *> std::make_pair<>(SILValue &&, SILInstruction *&&);
+template std::pair<SILType, SILType> std::make_pair<>(SILType &&, SILType &&);
+template llvm::DomTreeNodeBase<SILBasicBlock> *&std::get<0>(std::tuple<llvm::DomTreeNodeBase<SILBasicBlock> *, std::default_delete<llvm::DomTreeNodeBase<SILBasicBlock>>> &);
+template std::default_delete<llvm::DomTreeNodeBase<SILBasicBlock>> &std::get<1>(std::tuple<llvm::DomTreeNodeBase<SILBasicBlock> *, std::default_delete<llvm::DomTreeNodeBase<SILBasicBlock>>> &);
+// END: Workaround for C++ interop

Original file line number	Diff line number	Diff line change
`@@ -367,3 +367,12 @@ StaticInitCloner::clone(SingleValueInstruction *initVal) {`
`367`	`367`	`}`
`368`	`368`	`return cast<SingleValueInstruction>(getMappedValue(initVal));`
`369`	`369`	`}`
	`370`	`+`
	`371`	`+// START: Workaround for C++ interop`
	`372`	`+#include <tuple>`
	`373`	`+template std::pair<SILInstruction , SILInstruction > std::make_pair<>(SILInstruction &&, SILInstruction &&);`
	`374`	`+template std::pair<SILValue, SILInstruction > std::make_pair<>(SILValue &&, SILInstruction &&);`
	`375`	`+template std::pair<SILType, SILType> std::make_pair<>(SILType &&, SILType &&);`
	`376`	`+template llvm::DomTreeNodeBase<SILBasicBlock> &std::get<0>(std::tuple<llvm::DomTreeNodeBase<SILBasicBlock> , std::default_delete<llvm::DomTreeNodeBase<SILBasicBlock>>> &);`
	`377`	`+template std::default_delete<llvm::DomTreeNodeBase<SILBasicBlock>> &std::get<1>(std::tuple<llvm::DomTreeNodeBase<SILBasicBlock> *, std::default_delete<llvm::DomTreeNodeBase<SILBasicBlock>>> &);`
	`378`	`+// END: Workaround for C++ interop`