maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[ASTImporter] Import described template (if any) of function. 

Summary:
When a function is imported, check if it has a described template.
The name lookup is corrected to find the templated entity in this case.
The described template of the function is imported too.

Reviewers: a.sidorin, a_sidorin

Reviewed By: a_sidorin

Subscribers: a_sidorin, martong, cfe-commits

Differential Revision: https://reviews.llvm.org/D49235

llvm-svn: 337260
This commit is contained in:
Balazs Keri 2018-07-17 09:52:41 +00:00
parent 3b9e342ae1
commit a35798db91
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clang/lib/AST/ASTImporter.cpp
View File

@ -2539,6 +2539,7 @@ Decl *ASTNodeImporter::VisitFunctionDecl(FunctionDecl *D) {
return ToD;
const FunctionDecl *FoundByLookup = nullptr;
FunctionTemplateDecl *FromFT = D->getDescribedFunctionTemplate();
// If this is a function template specialization, then try to find the same
// existing specialization in the "to" context. The localUncachedLookup
@ -2565,6 +2566,14 @@ Decl *ASTNodeImporter::VisitFunctionDecl(FunctionDecl *D) {
if (!FoundDecl->isInIdentifierNamespace(IDNS))
continue;
// If template was found, look at the templated function.
if (FromFT) {
if (auto *Template = dyn_cast<FunctionTemplateDecl>(FoundDecl))
FoundDecl = Template->getTemplatedDecl();
else
continue;
}
if (auto *FoundFunction = dyn_cast<FunctionDecl>(FoundDecl)) {
if (FoundFunction->hasExternalFormalLinkage() &&
D->hasExternalFormalLinkage()) {
@ -2740,6 +2749,11 @@ Decl *ASTNodeImporter::VisitFunctionDecl(FunctionDecl *D) {
ToFunction->setType(T);
}
// Import the describing template function, if any.
if (FromFT)
if (!Importer.Import(FromFT))
return nullptr;
if (D->doesThisDeclarationHaveABody()) {
if (Stmt *FromBody = D->getBody()) {
if (Stmt *ToBody = Importer.Import(FromBody)) {

2
clang/unittests/AST/ASTImporterTest.cpp
View File

@ -1185,7 +1185,7 @@ TEST_P(ASTImporterTestBase,
}
TEST_P(ASTImporterTestBase,
DISABLED_ImportOfTemplatedDeclShouldImportTheFunctionTemplateDecl) {
ImportOfTemplatedDeclShouldImportTheFunctionTemplateDecl) {
Decl *FromTU = getTuDecl("template<class X> void f(){}", Lang_CXX);
auto FromFT = FirstDeclMatcher<FunctionTemplateDecl>().match(
FromTU, functionTemplateDecl());