averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[NFC] Add ClangImporter header diagnostic helper

Browse Source
This commit is contained in:
Becca Royal-Gordon
2021-11-12 17:57:50 -08:00
parent 0842795eb5
commit d2d786a76a
4 changed files with 59 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/ClangImporter/ImportDecl.cpp
View File

@@ -8607,12 +8607,7 @@ void ClangImporter::Implementation::importAttributes(
if (SeenMainActorAttr) {
// Cannot add main actor annotation twice. We'll keep the first
// one and raise a warning about the duplicate.
auto &clangSrcMgr = getClangASTContext().getSourceManager();
ClangSourceBufferImporter &bufferImporter =
getBufferImporterForDiagnostics();
SourceLoc attrLoc = bufferImporter.resolveSourceLocation(
clangSrcMgr, swiftAttr->getLocation());
HeaderLoc attrLoc(swiftAttr->getLocation());
diagnose(attrLoc, diag::import_multiple_mainactor_attr,
swiftAttr->getAttribute(),
SeenMainActorAttr.getValue()->getAttribute());
@@ -8668,11 +8663,7 @@ void ClangImporter::Implementation::importAttributes(
if (hadError) {
// Complain about the unhandled attribute or modifier.
auto &clangSrcMgr = getClangASTContext().getSourceManager();
ClangSourceBufferImporter &bufferImporter =
getBufferImporterForDiagnostics();
SourceLoc attrLoc = bufferImporter.resolveSourceLocation(
clangSrcMgr, swiftAttr->getLocation());
HeaderLoc attrLoc(swiftAttr->getLocation());
diagnose(attrLoc, diag::clang_swift_attr_unhandled,
swiftAttr->getAttribute());
}
@@ -9246,19 +9237,13 @@ ClangImporter::Implementation::importDeclForDeclContext(
if (!contextDeclsWarnedAbout.insert(contextDecl).second)
return nullptr;
auto convertLoc = [&](clang::SourceLocation clangLoc) {
return getBufferImporterForDiagnostics()
.resolveSourceLocation(getClangASTContext().getSourceManager(),
clangLoc);
};
auto getDeclName = [](const clang::Decl *D) -> StringRef {
if (auto ND = dyn_cast<clang::NamedDecl>(D))
return ND->getName();
return "<anonymous>";
};
SourceLoc loc = convertLoc(importingDecl->getLocation());
HeaderLoc loc(importingDecl->getLocation());
diagnose(loc, diag::swift_name_circular_context_import,
writtenName, getDeclName(importingDecl));
@@ -9266,7 +9251,7 @@ ClangImporter::Implementation::importDeclForDeclContext(
for (auto entry : make_range(contextDeclsBeingImported.rbegin(), iter)) {
auto otherDecl = std::get<0>(entry);
auto otherWrittenName = std::get<1>(entry);
diagnose(convertLoc(otherDecl->getLocation()),
diagnose(HeaderLoc(otherDecl->getLocation()),
diag::swift_name_circular_context_import_other,
otherWrittenName, getDeclName(otherDecl));
}