diff options
| author | Douglas Gregor <dgregor@apple.com> | 2010-10-01 23:55:07 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2010-10-01 23:55:07 +0000 |
| commit | 81134ad7a056e45b7cb4ee1b562ab8c8413d65b7 (patch) | |
| tree | 83c102932790ff5cff8f88889cea6b21a1d26c6b | |
| parent | a1aa9e36e6e21f74c56cf9e72cb5bd9aa2a92fd4 (diff) | |
Don't add an imported function into its lexical context until *after*
we've set all of its parameters. Fixes <rdar://problem/8499598>;
thanks to Sean for the diagnosis.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@115387 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/AST/ASTImporter.cpp | 6 | ||||
| -rw-r--r-- | test/ASTMerge/Inputs/class1.cpp | 7 | ||||
| -rw-r--r-- | test/ASTMerge/Inputs/class2.cpp | 1 |
3 files changed, 12 insertions, 2 deletions
diff --git a/lib/AST/ASTImporter.cpp b/lib/AST/ASTImporter.cpp index 147a1ed4e7..78cb536550 100644 --- a/lib/AST/ASTImporter.cpp +++ b/lib/AST/ASTImporter.cpp @@ -1966,7 +1966,6 @@ Decl *ASTNodeImporter::VisitFunctionDecl(FunctionDecl *D) { ToFunction->setAccess(D->getAccess()); ToFunction->setLexicalDeclContext(LexicalDC); Importer.Imported(D, ToFunction); - LexicalDC->addDecl(ToFunction); // Set the parameters. for (unsigned I = 0, N = Parameters.size(); I != N; ++I) { @@ -1976,7 +1975,10 @@ Decl *ASTNodeImporter::VisitFunctionDecl(FunctionDecl *D) { ToFunction->setParams(Parameters.data(), Parameters.size()); // FIXME: Other bits to merge? - + + // Add this function to the lexical context. + LexicalDC->addDecl(ToFunction); + return ToFunction; } diff --git a/test/ASTMerge/Inputs/class1.cpp b/test/ASTMerge/Inputs/class1.cpp index e13faf0539..b600cdb1fc 100644 --- a/test/ASTMerge/Inputs/class1.cpp +++ b/test/ASTMerge/Inputs/class1.cpp @@ -6,3 +6,10 @@ struct B : A { float y; float foo(); }; + +struct C { + C(int i = 10); + C(const C&); + C &operator=(C&); + ~C(); +}; diff --git a/test/ASTMerge/Inputs/class2.cpp b/test/ASTMerge/Inputs/class2.cpp index 91b84dc13b..fa38916f5e 100644 --- a/test/ASTMerge/Inputs/class2.cpp +++ b/test/ASTMerge/Inputs/class2.cpp @@ -6,3 +6,4 @@ struct B : A { int y; int foo(); }; + |