[cfe-commits] r56629 - in /cfe/trunk: lib/Parse/ParseObjc.cpp test/Sema/rdar6248119.m

[Ted Kremenek]

Author: kremenek
Date: Thu Sep 25 19:31:16 2008
New Revision: 56629

URL: http://llvm.org/viewvc/llvm-project?rev=56629&view=rev
Log:
Have @finally introduce a new scope.
Fixes: <rdar://problem/6248119> @finally doesn't introduce a new scope

Added:
    cfe/trunk/test/Sema/rdar6248119.m
Modified:
    cfe/trunk/lib/Parse/ParseObjc.cpp

Modified: cfe/trunk/lib/Parse/ParseObjc.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseObjc.cpp?rev=56629&r1=56628&r2=56629&view=diff

==============================================================================
--- cfe/trunk/lib/Parse/ParseObjc.cpp (original)
+++ cfe/trunk/lib/Parse/ParseObjc.cpp Thu Sep 25 19:31:16 2008
@@ -1311,6 +1311,8 @@
     } else {
       assert(Tok.isObjCAtKeyword(tok::objc_finally) && "Lookahead confused?");
       ConsumeToken(); // consume finally
+      EnterScope(Scope::DeclScope);
+
       
       StmtResult FinallyBody(true);
       if (Tok.is(tok::l_brace))
@@ -1322,6 +1324,7 @@
       FinallyStmt = Actions.ActOnObjCAtFinallyStmt(AtCatchFinallyLoc, 
                                                    FinallyBody.Val);
       catch_or_finally_seen = true;
+      ExitScope();
       break;
     }
   }

Added: cfe/trunk/test/Sema/rdar6248119.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/rdar6248119.m?rev=56629&view=auto

==============================================================================
--- cfe/trunk/test/Sema/rdar6248119.m (added)
+++ cfe/trunk/test/Sema/rdar6248119.m Thu Sep 25 19:31:16 2008
@@ -0,0 +1,11 @@
+// RUN: clang -fsyntax-only %s -verify
+// Test case for: 
+//   <rdar://problem/6248119> @finally doesn't introduce a new scope
+
+void f0() {
+  int i;
+  @try { 
+  } @finally {
+    int i = 0;
+  }
+}