Skip to content

[4.2 EARLY] [ClangImporter] Hardcode NSString being bridged to String #17431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jrose-apple merged 1 commit into from
Jun 22, 2018
Merged

[4.2 EARLY] [ClangImporter] Hardcode NSString being bridged to String #17431

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions lib/ClangImporter/ImportType.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -949,12 +949,13 @@ namespace {
}

// Determine whether this Objective-C class type is bridged to
// a Swift type.
// a Swift type. Hardcode "NSString" since it's referenced from
// the ObjectiveC module (a level below Foundation).
Type bridgedType;
if (auto objcClassDef = objcClass->getDefinition())
bridgedType = mapSwiftBridgeAttr(objcClassDef);
else
bridgedType = mapSwiftBridgeAttr(objcClass);
else if (objcClass->getName() == "NSString")
bridgedType = Impl.SwiftContext.getStringDecl()->getDeclaredType();

if (bridgedType) {
// Gather the type arguments.
Expand Down