4 files changed, 49 insertions, 27 deletions

diff --git a/include/clang/Sema/IdentifierResolver.h b/include/clang/Sema/IdentifierResolver.h
index 33486c2ffe..8385ce8ee1 100644
--- a/include/clang/Sema/IdentifierResolver.h
+++ b/include/clang/Sema/IdentifierResolver.h
@@ -171,9 +171,9 @@ public:
   /// (and, therefore, replaced).
   bool ReplaceDecl(NamedDecl *Old, NamedDecl *New);
 
-  /// \brief Insert the given declaration prior to the given iterator
-  /// position
-  void InsertDecl(iterator Pos, NamedDecl *D);
+  /// \brief Insert the given declaration after the given iterator
+  /// position.
+  void InsertDeclAfter(iterator Pos, NamedDecl *D);
 
   /// \brief Link the declaration into the chain of declarations for
   /// the given identifier.
diff --git a/lib/Sema/IdentifierResolver.cpp b/lib/Sema/IdentifierResolver.cpp
index fcfc05380b..d520a6edab 100644
--- a/lib/Sema/IdentifierResolver.cpp
+++ b/lib/Sema/IdentifierResolver.cpp
@@ -168,36 +168,26 @@ void IdentifierResolver::AddDecl(NamedDecl *D) {
   IDI->AddDecl(D);
 }
 
-void IdentifierResolver::InsertDecl(iterator Pos, NamedDecl *D) {
-  if (Pos == iterator()) {
-    // Simple case: insert at the beginning of the list (which is the
-    // end of the stored vector).
-    AddDecl(D);
-    return;
-  }
-  
+void IdentifierResolver::InsertDeclAfter(iterator Pos, NamedDecl *D) {
   DeclarationName Name = D->getDeclName();
   void *Ptr = Name.getFETokenInfo<void>();
   
-  if (isDeclPtr(Ptr)) {
-    // There's only one element, and we want to insert before it in the list.
-    // Just create the storage for these identifiers and insert them in the
-    // opposite order we normally would.
-    assert(isDeclPtr(Ptr) && "Not a single declaration!");
-    Name.setFETokenInfo(NULL);
-    IdDeclInfo *IDI = &(*IdDeclInfos)[Name];
-    NamedDecl *PrevD = static_cast<NamedDecl*>(Ptr);
-    IDI->AddDecl(D);
-    IDI->AddDecl(PrevD);
+  if (Pos == iterator() || isDeclPtr(Ptr)) {
+    // Simple case: insert at the end of the list (which is the
+    // end of the stored vector).
+    AddDecl(D);
     return;
   }
 
+  if (IdentifierInfo *II = Name.getAsIdentifierInfo())
+    II->setIsFromAST(false);
+  
   // General case: insert the declaration at the appropriate point in the 
   // list, which already has at least two elements.
   IdDeclInfo *IDI = toIdDeclInfo(Ptr);
-  if (Pos.isIterator())
-    IDI->InsertDecl(Pos.getIterator(), D);
-  else
+  if (Pos.isIterator()) {
+    IDI->InsertDecl(Pos.getIterator() + 1, D);
+  } else
     IDI->InsertDecl(IDI->decls_begin(), D);
 }
 
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);
   }
diff --git a/test/SemaCXX/goto.cpp b/test/SemaCXX/goto.cpp
index 2db9d97fd8..e8b7822c32 100644
--- a/test/SemaCXX/goto.cpp
+++ b/test/SemaCXX/goto.cpp
@@ -1,5 +1,4 @@
 // RUN: %clang_cc1 -fsyntax-only -verify %s
-
 // PR9463
 double *end;
 void f() {
@@ -16,3 +15,32 @@ void f() {
 void g() {
   end = 1; // expected-error{{assigning to 'double *' from incompatible type 'int'}}
 }
+
+void h(int end) {
+  {
+    goto end; // expected-error{{use of undeclared label 'end'}}
+  }
+}
+
+void h2(int end) {
+  {
+    __label__ end;
+    goto end;
+
+  end:
+    ::end = 0;
+  }
+ end:
+  end = 1;
+}
+
+class X {
+public:
+  X();
+};
+
+void rdar9135994()
+{
+X:  
+    goto X;
+}