Skip to content

[Clang Importer] Get off of useSwift2Name and onto versions #6278

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
milseman merged 4 commits into from
Dec 15, 2016
Merged

[Clang Importer] Get off of useSwift2Name and onto versions #6278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e9613dc
[Import Name] Finish weaning importName() off of options.
milseman Dec 14, 2016
0a38b45
[Clang Importer] Comment fix up
milseman Dec 14, 2016
ec78d17
[Clang Importer] Rename some variables and methods
milseman Dec 14, 2016
1e42a16
[Clang Importer] Plumb versions everywhere
milseman Dec 14, 2016
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
29 changes: 16 additions & 13 deletions lib/ClangImporter/ClangAdapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,13 +418,8 @@ OmissionTypeName importer::getClangTypeNameForOmission(clang::ASTContext &ctx,
return StringRef();
}

clang::SwiftNewtypeAttr *
importer::getSwiftNewtypeAttr(const clang::TypedefNameDecl *decl,
bool useSwift2Name) {
// If we're determining the Swift 2 name, don't honor this attribute.
if (useSwift2Name)
return nullptr;

static clang::SwiftNewtypeAttr *
retrieveNewTypeAttr(const clang::TypedefNameDecl *decl) {
// Retrieve the attribute.
auto attr = decl->getAttr<clang::SwiftNewtypeAttr>();
if (!attr)
Expand All @@ -439,22 +434,30 @@ importer::getSwiftNewtypeAttr(const clang::TypedefNameDecl *decl,
return attr;
}

clang::SwiftNewtypeAttr *
importer::getSwiftNewtypeAttr(const clang::TypedefNameDecl *decl,
ImportNameVersion version) {
// Newtype was introduced in Swift 3
if (version < ImportNameVersion::Swift3 )
return nullptr;
return retrieveNewTypeAttr(decl);
}

// If this decl is associated with a swift_newtype typedef, return it, otherwise
// null
clang::TypedefNameDecl *importer::findSwiftNewtype(const clang::NamedDecl *decl,
clang::Sema &clangSema,
bool useSwift2Name) {
// If we aren't honoring the swift_newtype attribute, don't even
// bother looking. Similarly for swift2 names
if (useSwift2Name)
ImportNameVersion version) {
// Newtype was introduced in Swift 3
if (version < ImportNameVersion::Swift3 )
return nullptr;

auto varDecl = dyn_cast<clang::VarDecl>(decl);
if (!varDecl)
return nullptr;

if (auto typedefTy = varDecl->getType()->getAs<clang::TypedefType>())
if (getSwiftNewtypeAttr(typedefTy->getDecl(), false))
if (retrieveNewTypeAttr(typedefTy->getDecl()))
return typedefTy->getDecl();

// Special case: "extern NSString * fooNotification" adopts
Expand All @@ -472,7 +475,7 @@ clang::TypedefNameDecl *importer::findSwiftNewtype(const clang::NamedDecl *decl,
return nullptr;

// Make sure it also has a newtype decl on it
if (getSwiftNewtypeAttr(nsDecl, false))
if (retrieveNewTypeAttr(nsDecl))
return nsDecl;

return nullptr;
Expand Down
6 changes: 4 additions & 2 deletions lib/ClangImporter/ClangAdapter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
#include "llvm/ADT/SmallBitVector.h"
#include "clang/Basic/Specifiers.h"

#include "ImportName.h"

namespace clang {
class ASTContext;
class Decl;
Expand Down Expand Up @@ -77,7 +79,7 @@ OmissionTypeName getClangTypeNameForOmission(clang::ASTContext &ctx,

/// Find the swift_newtype attribute on the given typedef, if present.
clang::SwiftNewtypeAttr *getSwiftNewtypeAttr(const clang::TypedefNameDecl *decl,
bool useSwift2Name);
ImportNameVersion version);

/// Retrieve a bit vector containing the non-null argument
/// annotations for the given declaration.
Expand All @@ -92,7 +94,7 @@ bool isNSNotificationGlobal(const clang::NamedDecl *);
// swift_newtype), return it, otherwise null
clang::TypedefNameDecl *findSwiftNewtype(const clang::NamedDecl *decl,
clang::Sema &clangSema,
bool useSwift2Name);
ImportNameVersion version);

/// Whether the passed type is NSString *
bool isNSString(const clang::Type *);
Expand Down
38 changes: 21 additions & 17 deletions lib/ClangImporter/ClangImporter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1218,6 +1218,7 @@ ClangImporter::Implementation::Implementation(ASTContext &ctx,
ImportForwardDeclarations(opts.ImportForwardDeclarations),
InferImportAsMember(opts.InferImportAsMember),
DisableSwiftBridgeAttr(opts.DisableSwiftBridgeAttr),
CurrentVersion(nameVersionFromOptions(ctx.LangOpts)),
BridgingHeaderLookupTable(nullptr), platformAvailability(ctx.LangOpts),
nameImporter() {}

Expand Down Expand Up @@ -1722,7 +1723,7 @@ void ClangImporter::lookupBridgingHeaderDecls(
for (auto *ClangD : Impl.BridgeHeaderTopLevelDecls) {
if (filter(ClangD)) {
if (auto *ND = dyn_cast<clang::NamedDecl>(ClangD)) {
if (Decl *imported = Impl.importDeclReal(ND, /*useSwift2Name=*/false))
if (Decl *imported = Impl.importDeclReal(ND, Impl.CurrentVersion))
receiver(imported);
}
}
Expand Down Expand Up @@ -1787,7 +1788,7 @@ bool ClangImporter::lookupDeclsFromHeader(StringRef Filename,
continue;
if (filter(ClangD)) {
if (auto *ND = dyn_cast<clang::NamedDecl>(ClangD)) {
if (Decl *imported = Impl.importDeclReal(ND, /*useSwift2Name=*/false))
if (Decl *imported = Impl.importDeclReal(ND, Impl.CurrentVersion))
receiver(imported);
}
}
Expand Down Expand Up @@ -1892,7 +1893,7 @@ void ClangModuleUnit::getTopLevelDecls(SmallVectorImpl<Decl*> &results) const {
// Add the extensions produced by importing categories.
for (auto category : lookupTable->categories()) {
if (auto extension = cast_or_null<ExtensionDecl>(
owner.Impl.importDecl(category, false)))
owner.Impl.importDecl(category, owner.Impl.CurrentVersion)))
results.push_back(extension);
}

Expand All @@ -1903,7 +1904,8 @@ void ClangModuleUnit::getTopLevelDecls(SmallVectorImpl<Decl*> &results) const {
llvm::SmallPtrSet<ExtensionDecl *, 8> knownExtensions;
for (auto entry : lookupTable->allGlobalsAsMembers()) {
auto decl = entry.get<clang::NamedDecl *>();
auto importedDecl = owner.Impl.importDecl(decl, false);
auto importedDecl =
owner.Impl.importDecl(decl, owner.Impl.CurrentVersion);
if (!importedDecl) continue;

auto ext = dyn_cast<ExtensionDecl>(importedDecl->getDeclContext());
Expand Down Expand Up @@ -2035,7 +2037,7 @@ void ClangImporter::loadExtensions(NominalTypeDecl *nominal,
for (auto I = objcClass->visible_categories_begin(),
E = objcClass->visible_categories_end();
I != E; ++I) {
Impl.importDeclReal(*I, /*useSwift2Name=*/false);
Impl.importDeclReal(*I, Impl.CurrentVersion);
}
}

Expand Down Expand Up @@ -2096,7 +2098,7 @@ void ClangImporter::loadObjCMethods(
continue;

if (auto method = dyn_cast_or_null<AbstractFunctionDecl>(
Impl.importDecl(objcMethod, false))) {
Impl.importDecl(objcMethod, Impl.CurrentVersion))) {
foundMethods.push_back(method);
}
}
Expand Down Expand Up @@ -2183,13 +2185,15 @@ void ClangModuleUnit::lookupObjCMethods(
// If we found a property accessor, import the property.
if (objcMethod->isPropertyAccessor())
(void)owner.Impl.importDecl(objcMethod->findPropertyDecl(true),
false);
owner.Impl.CurrentVersion);

// Import it.
// FIXME: Retrying a failed import works around recursion bugs in the Clang
// importer.
auto imported = owner.Impl.importDecl(objcMethod, false);
if (!imported) imported = owner.Impl.importDecl(objcMethod, false);
auto imported =
owner.Impl.importDecl(objcMethod, owner.Impl.CurrentVersion);
if (!imported)
imported = owner.Impl.importDecl(objcMethod, owner.Impl.CurrentVersion);
if (!imported) continue;

if (auto func = dyn_cast<AbstractFunctionDecl>(imported))
Expand Down Expand Up @@ -2259,7 +2263,7 @@ std::string ClangImporter::getClangModuleHash() const {
}

Decl *ClangImporter::importDeclCached(const clang::NamedDecl *ClangDecl) {
return Impl.importDeclCached(ClangDecl, /*useSwift2Name=*/false);
return Impl.importDeclCached(ClangDecl, Impl.CurrentVersion);
}

void ClangImporter::printStatistics() const {
Expand All @@ -2275,7 +2279,7 @@ void ClangImporter::verifyAllModules() {
// more decls to be imported and modify the map while we are iterating it.
SmallVector<Decl *, 8> Decls;
for (auto &I : Impl.ImportedDecls)
if (!I.first.second)
if (I.first.second == Impl.CurrentVersion)
if (Decl *D = I.second)
Decls.push_back(D);

Expand Down Expand Up @@ -2559,7 +2563,7 @@ void ClangImporter::Implementation::lookupValue(
// If it's a Clang declaration, try to import it.
if (auto clangDecl = entry.dyn_cast<clang::NamedDecl *>()) {
decl = cast_or_null<ValueDecl>(
importDeclReal(clangDecl->getMostRecentDecl(), false));
importDeclReal(clangDecl->getMostRecentDecl(), CurrentVersion));
if (!decl) continue;
} else {
// Try to import a macro.
Expand Down Expand Up @@ -2597,9 +2601,8 @@ void ClangImporter::Implementation::lookupValue(
// name.
if (!anyMatching) {
if (auto clangDecl = entry.dyn_cast<clang::NamedDecl *>()) {
if (auto swift2Decl = cast_or_null<ValueDecl>(
importDeclReal(clangDecl->getMostRecentDecl(),
true))) {
if (auto swift2Decl = cast_or_null<ValueDecl>(importDeclReal(
clangDecl->getMostRecentDecl(), ImportNameVersion::Swift2))) {
if (swift2Decl->getFullName().matchesRef(name) &&
swift2Decl->getDeclContext()->isModuleScopeContext()) {
consumer.foundDecl(swift2Decl,
Expand Down Expand Up @@ -2636,7 +2639,8 @@ void ClangImporter::Implementation::lookupObjCMembers(
if (!isVisibleClangEntry(clangCtx, clangDecl)) continue;

// Import the declaration.
auto decl = cast_or_null<ValueDecl>(importDeclReal(clangDecl, false));
auto decl =
cast_or_null<ValueDecl>(importDeclReal(clangDecl, CurrentVersion));
if (!decl)
continue;

Expand All @@ -2659,7 +2663,7 @@ void ClangImporter::Implementation::lookupObjCMembers(
// If we didn't find anything, try under the Swift 2 name.
if (!matchedAny) {
if (auto swift2Decl = cast_or_null<ValueDecl>(
importDeclReal(clangDecl, true))) {
importDeclReal(clangDecl, Version::Swift2))) {
if (swift2Decl->getFullName().matchesRef(name)) {
consumer.foundDecl(swift2Decl, DeclVisibilityKind::DynamicLookup);
}
Expand Down
Loading