commit 5cd38432a45b9aa6be8a7bf4ba9b78a84f57ddab
author Steve Naroff <snaroff@apple.com> Sat Feb 28 21:01:15 2009 +0000
committer Steve Naroff <snaroff@apple.com> Sat Feb 28 21:01:15 2009 +0000
tree c64551553787ea50357ad62db74d5585940d1194
parent 9a48d86111661a46e9c60ab5ae6cd4e399d3ff6d

Remove PrevFunctionScope slot (it isn't needed)...use getParent() instead.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@65718 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Sema/SemaExpr.cpp

diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index e34a22e..1a93039 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -4404,7 +4404,6 @@
 
   // Add BSI to CurBlock.
   BSI->PrevBlockInfo = CurBlock;
-  BSI->PrevFunctionScope = ActiveScope;
   CurBlock = BSI;
   ActiveScope = BlockScope;
 
@@ -4501,8 +4500,9 @@
 
   PopDeclContext();
 
-  ActiveScope = CurBlock->PrevFunctionScope;
-    
+  // Before poping CurBlock, set ActiveScope to this scopes parent.
+  ActiveScope = CurBlock->TheScope->getParent();
+  
   // Pop off CurBlock, handle nested blocks.
   CurBlock = CurBlock->PrevBlockInfo;