[cxx-interop] Instantiate C++ class templates from Swift #33284

hlopko · 2020-08-04T16:42:09Z

This PR makes it possible to instantiate C++ class templates from Swift. Given a C++ header:

// C++ module `ClassTemplates`
template<class T>
struct MagicWrapper {
  T t;
};

struct MagicNumber {};

it is now possible to write in Swift:

import ClassTemplates

func x() -> MagicWrapper<MagicNumber> {
  return MagicWrapper<MagicNumber>()
}

This is achieved by importing C++ class templates as generic structs, and then when Swift type checker calls applyGenericArguments we detect when the generic struct is backed by the C++ class template and call Clang to instantiate the template. In order to make it possible to put class instantiations such as MagicWrapper<MagicNumber> into Swift signatures, we have created a new field in StructDecl named TemplateInstantiationType where the typechecker stores the BoundGenericType which we serialize. Deserializer then notices that the BoundGenericType is actually a C++ class template and performs the instantiation logic.

Depends on #33420.
Progress towards https://bugs.swift.org/browse/SR-13261.
Fixes https://bugs.swift.org/browse/SR-13775.

hlopko · 2020-08-04T16:45:45Z

This PR depends on #32950.

hlopko · 2020-09-18T09:59:25Z

@swift-ci please test

hlopko · 2020-09-28T09:20:43Z

@swift-ci please test

swift-ci · 2020-09-28T10:35:18Z

Build failed
Swift Test OS X Platform
Git Sha - 45c63aa

swift-ci · 2020-09-28T10:39:40Z

Build failed
Swift Test Linux Platform
Git Sha - 45c63aa

hlopko · 2020-09-29T07:44:49Z

@swift-ci please test

hlopko · 2020-09-29T08:30:37Z

@swift-ci please test

swift-ci · 2020-09-29T09:05:26Z

Build failed
Swift Test Linux Platform
Git Sha - 69ae243

hlopko · 2020-09-29T09:35:22Z

@swift-ci please test

hlopko · 2020-09-29T09:50:35Z

@swift-ci please test

swift-ci · 2020-09-29T10:02:06Z

Build failed
Swift Test OS X Platform
Git Sha - 69ae243

hlopko · 2020-09-30T06:17:49Z

@swift-ci please test

swift-ci · 2020-09-30T06:21:01Z

Build failed
Swift Test Linux Platform
Git Sha - 69ae243

swift-ci · 2020-09-30T06:21:36Z

Build failed
Swift Test OS X Platform
Git Sha - 69ae243

hlopko · 2020-09-30T07:25:07Z

@swift-ci please test

swift-ci · 2020-09-30T08:44:20Z

Build failed
Swift Test Linux Platform
Git Sha - be2e706

swift-ci · 2020-09-30T08:49:43Z

Build failed
Swift Test OS X Platform
Git Sha - be2e706

hlopko · 2020-10-01T07:37:39Z

@swift-ci please test

swift-ci · 2020-10-01T08:31:27Z

Build failed
Swift Test Linux Platform
Git Sha - 1ca883b

swift-ci · 2020-10-01T08:41:42Z

Build failed
Swift Test OS X Platform
Git Sha - 1ca883b

hlopko · 2020-10-01T08:43:41Z

@swift-ci please test

swift-ci · 2020-10-01T09:36:53Z

Build failed
Swift Test OS X Platform
Git Sha - 9eb0a1f

hlopko · 2021-01-25T13:04:49Z

@swift-ci please test.

swift-ci · 2021-01-25T13:52:30Z

Build failed
Swift Test OS X Platform
Git Sha - e9a44d4

swift-ci · 2021-01-25T14:26:04Z

Build failed
Swift Test Linux Platform
Git Sha - e9a44d4

hlopko · 2021-01-25T14:30:57Z

@swift-ci please test.

swift-ci · 2021-01-25T14:49:09Z

Build failed
Swift Test Linux Platform
Git Sha - 71a9065

swift-ci · 2021-01-25T17:08:53Z

Build failed
Swift Test OS X Platform
Git Sha - 71a9065

hlopko · 2021-01-25T20:11:26Z

@swift-ci please test.

swift-ci · 2021-01-25T22:17:01Z

Build failed
Swift Test OS X Platform
Git Sha - c082a8c

hlopko · 2021-01-26T07:34:06Z

(Failure on mac came from lldb, not related to this PR)

hlopko · 2021-01-26T07:34:10Z

@swift-ci please test.

swift-ci · 2021-01-26T10:24:29Z

Build failed
Swift Test OS X Platform
Git Sha - 3bfdce6

lib/Serialization/Deserialization.cpp

include/swift/AST/Decl.h

test/Interop/Cxx/templates/Inputs/class-template-nested-type-for-swift-module.h

test/Interop/Cxx/templates/Inputs/class-template-in-namespace-for-swift-module.h

test/Interop/Cxx/templates/class-template-in-namespace-module-interface.swift

test/Interop/Cxx/templates/class-template-instantiation-existing-specialization.swift

Co-authored-by: Dmitri Gribenko <[email protected]>

…ng-specialization.swift Co-authored-by: Dmitri Gribenko <[email protected]>

hlopko · 2021-01-26T13:32:57Z

@swift-ci please test.

swift-ci · 2021-01-26T16:18:29Z

Build failed
Swift Test OS X Platform
Git Sha - ff7cdc3

hlopko · 2021-01-27T07:43:28Z

@swift-ci please test macos platform.

hlopko · 2021-01-27T08:00:43Z

@swift-ci please test.

gribozavr added the c++ interop Feature: Interoperability with C++ label Aug 5, 2020

hlopko mentioned this pull request Aug 10, 2020

[cxx-interop] Import typedef-ed template instantiations #32950

Merged

hlopko changed the base branch from master to main September 28, 2020 09:20

hlopko marked this pull request as ready for review October 1, 2020 08:48

hlopko requested review from gribozavr, varungandhi-apple, zoecarver and CodaFi October 1, 2020 08:49

hlopko added 5 commits January 25, 2021 11:12

Serialize clang template type before instantiation

b5ecc40

Cleanup

e3641c1

Polish

4e5fb25

Polish

e9a44d4

Add (failing) test for nested types

71a9065

hlopko added 2 commits January 25, 2021 21:09

Merge branch 'main' into class_templates

4d09706

Fix test

c082a8c

Merge branch 'main' into class_templates

3bfdce6

gribozavr approved these changes Jan 26, 2021

View reviewed changes

Marcel Hlopko and others added 3 commits January 26, 2021 13:42

Update lib/Serialization/Deserialization.cpp

22e8eda

Co-authored-by: Dmitri Gribenko <[email protected]>

Update test/Interop/Cxx/templates/class-template-instantiation-existi…

435a796

…ng-specialization.swift Co-authored-by: Dmitri Gribenko <[email protected]>

Addressing comments.

ff7cdc3

hlopko merged commit 4f5c75a into swiftlang:main Jan 27, 2021

This was referenced Jan 25, 2021

[SR-12594] [C++] Ensure that IRGen emits LLVM IR for functions from class template specializations #55039

Closed

[SR-13261] [C++] Allow instantiating C++ templates from Swift #55701

Open

[cxx-interop] Instantiate C++ class templates from Swift #33284

[cxx-interop] Instantiate C++ class templates from Swift #33284

Conversation

hlopko commented Aug 4, 2020 • edited Loading

hlopko commented Aug 4, 2020

hlopko commented Sep 18, 2020

hlopko commented Sep 28, 2020

swift-ci commented Sep 28, 2020

swift-ci commented Sep 28, 2020

hlopko commented Sep 29, 2020

hlopko commented Sep 29, 2020

swift-ci commented Sep 29, 2020

hlopko commented Sep 29, 2020

hlopko commented Sep 29, 2020

swift-ci commented Sep 29, 2020

hlopko commented Sep 30, 2020

swift-ci commented Sep 30, 2020

swift-ci commented Sep 30, 2020

hlopko commented Sep 30, 2020

swift-ci commented Sep 30, 2020

swift-ci commented Sep 30, 2020

hlopko commented Oct 1, 2020

swift-ci commented Oct 1, 2020

swift-ci commented Oct 1, 2020

hlopko commented Oct 1, 2020

swift-ci commented Oct 1, 2020

hlopko commented Jan 25, 2021

swift-ci commented Jan 25, 2021

swift-ci commented Jan 25, 2021

hlopko commented Jan 25, 2021

swift-ci commented Jan 25, 2021

swift-ci commented Jan 25, 2021

hlopko commented Jan 25, 2021

swift-ci commented Jan 25, 2021

hlopko commented Jan 26, 2021

hlopko commented Jan 26, 2021

swift-ci commented Jan 26, 2021

hlopko commented Jan 26, 2021

swift-ci commented Jan 26, 2021

hlopko commented Jan 27, 2021

hlopko commented Jan 27, 2021

hlopko commented Aug 4, 2020 •

edited

Loading