Merge pull request swiftlang#72331 from xedin/xfail-move-only-cxx-test-with-ncgenerics-enabled

xedin · web-flow · commit c3bc3d39d5c8 · 2024-03-14T16:37:53.000-07:00
[SIL] Fix a couple of test-cases with NCGenerics enabled
diff --git a/lib/SIL/IR/SILType.cpp b/lib/SIL/IR/SILType.cpp
@@ -1070,6 +1070,9 @@ bool SILType::isEscapable(const SILFunction &function) const {
                                      function.getModule().Types, 0);
   }
 
+  if (auto *moveOnlyTy = ty->getAs<SILMoveOnlyWrappedType>())
+    ty = moveOnlyTy->getInnerType();
+
   // TODO: Support ~Escapable in parameter packs.
   //
   // Treat all other SIL-specific types as Escapable.
diff --git a/test/SIL/lifetime_dependence_buffer_view_test.swift b/test/SIL/lifetime_dependence_buffer_view_test.swift
@@ -2,7 +2,8 @@
 // RUN:   -disable-experimental-parser-round-trip \
 // RUN:   -enable-experimental-feature NonescapableTypes \
 // RUN:   -enable-experimental-feature NoncopyableGenerics \
-// RUN:   -enable-experimental-lifetime-dependence-inference
+// RUN:   -enable-experimental-lifetime-dependence-inference \
+// RUN:   -disable-lifetime-dependence-diagnostics
 
 // REQUIRES: asserts
 // REQUIRES: swift_in_compiler

Original file line number	Diff line number	Diff line change
`@@ -1070,6 +1070,9 @@ bool SILType::isEscapable(const SILFunction &function) const {`
`1070`	`1070`	`function.getModule().Types, 0);`
`1071`	`1071`	`}`
`1072`	`1072`
	`1073`	`+ if (auto *moveOnlyTy = ty->getAs<SILMoveOnlyWrappedType>())`
	`1074`	`+ ty = moveOnlyTy->getInnerType();`
	`1075`	`+`
`1073`	`1076`	`// TODO: Support ~Escapable in parameter packs.`
`1074`	`1077`	`//`
`1075`	`1078`	`// Treat all other SIL-specific types as Escapable.`