Skip to content

Commit 91b969a

Browse files
authored
Merge pull request #34590 from apple/revert-34557-cxx/fix/is-dependent-type-over-aligned
Revert "[cxx-interop] Support class templates containing typedefs."
2 parents 203d2c2 + 5ef0136 commit 91b969a

File tree

4 files changed

+0
-31
lines changed

4 files changed

+0
-31
lines changed

lib/ClangImporter/ImportDecl.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3255,10 +3255,6 @@ namespace {
32553255
return nullptr;
32563256
}
32573257

3258-
// TODO(SR-13809): fix this once we support dependent types.
3259-
if (decl->getTypeForDecl()->isDependentType())
3260-
return nullptr;
3261-
32623258
// Don't import nominal types that are over-aligned.
32633259
if (Impl.isOverAligned(decl))
32643260
return nullptr;

test/Interop/Cxx/templates/Inputs/class-template-with-typedef.h

Lines changed: 0 additions & 15 deletions
This file was deleted.

test/Interop/Cxx/templates/Inputs/module.modulemap

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,3 @@ module ClassTemplateNonTypeParameter {
5353
module ClassTemplateTemplateParameter {
5454
header "class-template-template-parameter.h"
5555
}
56-
57-
module ClassTemplateWithTypedef {
58-
header "class-template-with-typedef.h"
59-
}

test/Interop/Cxx/templates/class-template-with-typedef-module-interface.swift

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)