diff options
| author | Anders Carlsson <andersca@mac.com> | 2009-08-08 17:48:49 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@mac.com> | 2009-08-08 17:48:49 +0000 |
| commit | 5fd7dad784320a7dc76eb2d7aaae649d697e4f23 (patch) | |
| tree | c451684039c946e73f8abc73a1fe212d67caac84 /clang/lib/Sema/Sema.cpp | |
| parent | f6448f57e6047dd61b3cded43c531416189c0c80 (diff) | |
| download | bcm5719-llvm-5fd7dad784320a7dc76eb2d7aaae649d697e4f23.tar.gz bcm5719-llvm-5fd7dad784320a7dc76eb2d7aaae649d697e4f23.zip | |
getFunctionLevelDeclContext needs to get the previous DeclContext if EnterDeclaratorContext has been called. Fixes PR4694. (Doug, please review)
llvm-svn: 78480
Diffstat (limited to 'clang/lib/Sema/Sema.cpp')
| -rw-r--r-- | clang/lib/Sema/Sema.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Sema/Sema.cpp b/clang/lib/Sema/Sema.cpp index 0259a3d18d5..b839e769691 100644 --- a/clang/lib/Sema/Sema.cpp +++ b/clang/lib/Sema/Sema.cpp @@ -310,7 +310,8 @@ void Sema::ActOnEndOfTranslationUnit() { //===----------------------------------------------------------------------===// DeclContext *Sema::getFunctionLevelDeclContext() { - DeclContext *DC = CurContext; + DeclContext *DC = PreDeclaratorDC ? PreDeclaratorDC : CurContext; + while (isa<BlockDecl>(DC)) DC = DC->getParent(); |
