Fix rdar://6814047, a crash on invalid in blocks code I noticed when
working on the previous fix.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@69742 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index 57902cc..fa85757 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -4755,8 +4755,8 @@
CurFunctionNeedsScopeChecking = CurBlock->SavedFunctionNeedsScopeChecking;
// Pop off CurBlock, handle nested blocks.
+ PopDeclContext();
CurBlock = CurBlock->PrevBlockInfo;
-
// FIXME: Delete the ParmVarDecl objects as well???
}
diff --git a/test/Sema/block-misc.c b/test/Sema/block-misc.c
index 8775aa7..bef2662 100644
--- a/test/Sema/block-misc.c
+++ b/test/Sema/block-misc.c
@@ -112,6 +112,13 @@
^{ break; }(); // expected-error {{'break' statement not in loop or switch statement}}
}
+
+void (^test12f)(void);
+void test12() {
+ test12f = ^test12f; // expected-error {{type name requires a specifier or qualifier}} expected-error {{expected expression}}
+}
+
+
// rdar://6808730
void *test13 = ^{
int X = 32;
@@ -131,9 +138,3 @@
};
};
}
-
-void (^test12f)(void);
-void test12() {
- test12f = ^test12f; // expected-error {{type name requires a specifier or qualifier}} expected-error {{expected expression}}
-}
-