diff options
| author | Douglas Gregor <dgregor@apple.com> | 2009-05-27 17:07:49 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2009-05-27 17:07:49 +0000 |
| commit | f98d9b60dbee3f523541b6f8831d1e549e4b0630 (patch) | |
| tree | df981cc93c08eeb53a951a26fed1d64fd80dc7a6 /clang/lib/Parse/ParseDeclCXX.cpp | |
| parent | bbcf90f9361ae3a7529f023697a01dcde31ad973 (diff) | |
| download | bcm5719-llvm-f98d9b60dbee3f523541b6f8831d1e549e4b0630.tar.gz bcm5719-llvm-f98d9b60dbee3f523541b6f8831d1e549e4b0630.zip | |
Improve name lookup for and template instantiation of declaration
references. There are several smallish fixes here:
- Make sure we look through template parameter scope when
determining whether we're parsing a nested class (or nested class
*template*). This makes sure that we delay parsing the bodies of
inline member functions until after we're out of the outermost
class (template) scope.
- Since the bodies of member functions are always parsed
"out-of-line", even when they were declared in-line, teach
unqualified name lookup to look into the (semantic) parents.
- Use the new InstantiateDeclRef to handle the instantiation of a
reference to a declaration (in DeclRefExpr), which drastically
simplifies template instantiation for DeclRefExprs.
- When we're instantiating a ParmVarDecl, it must be in the current
instantiation scope, so only look there.
Also, remove the #if 0's and FIXME's from the dynarray example, which
now compiles and executes thanks to Anders and Eli.
llvm-svn: 72481
Diffstat (limited to 'clang/lib/Parse/ParseDeclCXX.cpp')
| -rw-r--r-- | clang/lib/Parse/ParseDeclCXX.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/clang/lib/Parse/ParseDeclCXX.cpp b/clang/lib/Parse/ParseDeclCXX.cpp index c53b0f071c1..ee142138768 100644 --- a/clang/lib/Parse/ParseDeclCXX.cpp +++ b/clang/lib/Parse/ParseDeclCXX.cpp @@ -1067,7 +1067,9 @@ void Parser::ParseCXXMemberSpecification(SourceLocation RecordLoc, // // FIXME: Only function bodies and constructor ctor-initializers are // parsed correctly, fix the rest. - if (!CurScope->getParent()->isClassScope()) { + if (!CurScope->getParent()->isClassScope() && + !(CurScope->getParent()->isTemplateParamScope() && + CurScope->getParent()->getParent()->isClassScope())) { // We are not inside a nested class. This class and its nested classes // are complete and we can parse the delayed portions of method // declarations and the lexed inline method definitions. |

