1 files changed, 6 insertions, 2 deletions
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 19d96f2ec0..65a372850f 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -500,11 +500,15 @@ void Sema::PushOnScopeChains(NamedDecl *D, Scope *S, bool AddToContext) {
     // isn't strictly lexical, which breaks name lookup. Be careful to insert
     // the label at the appropriate place in the identifier chain.
     for (I = IdResolver.begin(D->getDeclName()); I != IEnd; ++I) {
-      if ((*I)->getLexicalDeclContext()->Encloses(CurContext))
+      DeclContext *IDC = (*I)->getLexicalDeclContext();
+      if (IDC == CurContext) {
+        if (!S->isDeclScope(*I))
+          continue;
+      } else if (IDC->Encloses(CurContext))
         break;
     }
     
-    IdResolver.InsertDecl(I, D);
+    IdResolver.InsertDeclAfter(I, D);
   } else {
     IdResolver.AddDecl(D);
   }