Index: clang/lib/Sema/IdentifierResolver.cpp
===================================================================
--- clang/lib/Sema/IdentifierResolver.cpp
+++ clang/lib/Sema/IdentifierResolver.cpp
@@ -121,7 +121,8 @@
       // of the controlled statement.
       //
       assert(S->getParent() && "No TUScope?");
-      if (S->getParent()->getFlags() & Scope::ControlScope) {
+      if ((S->getParent()->getFlags() & Scope::ControlScope) &&
+          !(S->getFnParent()->getFlags() & Scope::BlockScope)) {
         S = S->getParent();
         if (S->isDeclScope(D))
           return true;