Skip to content

Commit 314a652

Browse files
authored
Merge pull request swiftlang#63841 from zoecarver/remote-support-for-dependent-types
[cxx-interop] Disable support for dependent types.
2 parents ba377d7 + de67ef2 commit 314a652

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
lines changed

lib/ClangImporter/ImportType.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -920,8 +920,6 @@ namespace {
920920
ImportResult Visit##KIND##Type(const clang::KIND##Type *type) { \
921921
if (type->isSugared()) \
922922
return Visit(type->desugar()); \
923-
if (type->isDependentType()) \
924-
return Impl.SwiftContext.getAnyExistentialType(); \
925923
return Type(); \
926924
}
927925
MAYBE_SUGAR_TYPE(TypeOfExpr)

test/Interop/Cxx/templates/dependent-types-module-interface.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Waiting for support for dependent types to be added back: rdar://103530256&90587703&89090706&89090631&89034704&89034440&83406001&83367285
2+
// XFAIL: *
3+
14
// RUN: %target-swift-ide-test -print-module -module-to-print=DependentTypes -I %S/Inputs -source-filename=x -enable-experimental-cxx-interop | %FileCheck %s
25

36
// CHECK: func differentDependentArgAndRet<T, U>(_ a: Any, T: T.Type, U: U.Type) -> Any
@@ -10,4 +13,4 @@
1013
// CHECK: func refToDependent<T>(_ a: inout T) -> Any
1114
// TODO: Currently not imported (rdar://89034440).
1215
// CHECK-NOT: dependentRef
13-
// CHECK-NOT: dependentRefAndRefInferred
16+
// CHECK-NOT: dependentRefAndRefInferred

test/Interop/Cxx/templates/dependent-types-silgen.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Waiting for support for dependent types to be added back: rdar://103530256&90587703&89090706&89090631&89034704&89034440&83406001&83367285
2+
// XFAIL: *
3+
14
// RUN: %target-swift-emit-silgen %s -I %S/Inputs -enable-experimental-cxx-interop -disable-availability-checking | %FileCheck %s
25

36
import DependentTypes

test/Interop/Cxx/templates/dependent-types.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Waiting for support for dependent types to be added back: rdar://103530256&90587703&89090706&89090631&89034704&89034440&83406001&83367285
2+
// XFAIL: *
3+
14
// RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-experimental-cxx-interop -Xfrontend -validate-tbd-against-ir=none -Xfrontend -disable-availability-checking)
25
//
36
// REQUIRES: executable_test

0 commit comments

Comments
 (0)