commit e99d5f30446bc6dd0c2832758860250cd8ba53e5
author John McCall <rjmccall@apple.com> Thu Mar 25 22:08:03 2010 +0000
committer John McCall <rjmccall@apple.com> Thu Mar 25 22:08:03 2010 +0000
tree e2d7bd3ad08444d60f50ede5adc1aeac5a80f4c3
parent f9c4585c807d6f988d9a604d46c1f0967b60cea6

When finishing a function definition, leave the function definition *after*
doing all the cleanup tasks and checks.  This gives us the proper context for
checking access to base and member destructors.

llvm-svn: 99559

clang/lib/Sema/SemaDecl.cpp

diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index d449951..9bdcf09 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -4336,8 +4336,6 @@
     Body->Destroy(Context);
     return DeclPtrTy();
   }
-  if (!IsInstantiation)
-    PopDeclContext();
 
   // Verify and clean out per-function state.
 
@@ -4419,6 +4417,9 @@
     assert(ExprTemporaries.empty() && "Leftover temporaries in function");
   }
   
+  if (!IsInstantiation)
+    PopDeclContext();
+
   PopFunctionOrBlockScope();
   
   // If any errors have occurred, clear out any temporaries that may have