2 files changed, 18 insertions, 0 deletions
diff --git a/lib/Parse/ParseObjc.cpp b/lib/Parse/ParseObjc.cpp
index 17488d523e..c48cc8aa1a 100644
--- a/lib/Parse/ParseObjc.cpp
+++ b/lib/Parse/ParseObjc.cpp
@@ -1253,7 +1253,9 @@ Parser::StmtResult Parser::ParseObjCTryStmt(SourceLocation atLoc) {
   }
   StmtResult CatchStmts;
   StmtResult FinallyStmt;
+  EnterScope(Scope::DeclScope);
   StmtResult TryBody = ParseCompoundStatementBody();
+  ExitScope();
   if (TryBody.isInvalid)
     TryBody = Actions.ActOnNullStmt(Tok.getLocation());
   
diff --git a/test/Sema/rdar6248119.m b/test/Sema/rdar6248119.m
index fbfa1e3af3..ff402b296d 100644
--- a/test/Sema/rdar6248119.m
+++ b/test/Sema/rdar6248119.m
@@ -9,3 +9,19 @@ void f0() {
     int i = 0;
   }
 }
+
+void f1() {
+  int i;
+  @try { 
+    int i =0;
+  } @finally {
+  }
+}
+
+void f2() {
+  int i;
+  @try { 
+  } @catch(id e) {
+    int i = 0;
+  }
+}