[llvm-branch-commits] [cfe-branch] r128255 - in /cfe/branches/release_29: ./ lib/Sema/SemaDecl.cpp test/SemaCXX/goto.cpp test/SemaCXX/warn-unreachable.cpp

[Bill Wendling]

Author: void
Date: Fri Mar 25 00:42:19 2011
New Revision: 128255

URL: http://llvm.org/viewvc/llvm-project?rev=128255&view=rev
Log:
--- Merging r128210 into '.':
U    test/SemaCXX/goto.cpp
U    lib/Sema/SemaDecl.cpp


Modified:
    cfe/branches/release_29/   (props changed)
    cfe/branches/release_29/lib/Sema/SemaDecl.cpp
    cfe/branches/release_29/test/SemaCXX/goto.cpp
    cfe/branches/release_29/test/SemaCXX/warn-unreachable.cpp   (props changed)

Propchange: cfe/branches/release_29/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 25 00:42:19 2011
@@ -1,3 +1,3 @@
-/cfe/trunk:127238,127283,127308,127326,127329,127373,127405,127460,127507,127512,127541,127543,127563,127580,127582-127583,127622-127623,127652,127654-127655,127736-127738,127806,127811,127971,127980,128102,128104
+/cfe/trunk:127238,127283,127308,127326,127329,127373,127405,127460,127507,127512,127541,127543,127563,127580,127582-127583,127622-127623,127652,127654-127655,127736-127738,127806,127811,127971,127980,128102,128104,128210
 /cfe/trunk/test/SemaTemplate:126920
 /llvm/trunk:127238,127329,127652,127654-127655

Modified: cfe/branches/release_29/lib/Sema/SemaDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_29/lib/Sema/SemaDecl.cpp?rev=128255&r1=128254&r2=128255&view=diff
==============================================================================
--- cfe/branches/release_29/lib/Sema/SemaDecl.cpp (original)
+++ cfe/branches/release_29/lib/Sema/SemaDecl.cpp Fri Mar 25 00:42:19 2011
@@ -499,7 +499,7 @@
     // 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) {
-      DeclContext *IDC = (*I)->getLexicalDeclContext();
+      DeclContext *IDC = (*I)->getLexicalDeclContext()->getRedeclContext();
       if (IDC == CurContext) {
         if (!S->isDeclScope(*I))
           continue;

Modified: cfe/branches/release_29/test/SemaCXX/goto.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_29/test/SemaCXX/goto.cpp?rev=128255&r1=128254&r2=128255&view=diff
==============================================================================
--- cfe/branches/release_29/test/SemaCXX/goto.cpp (original)
+++ cfe/branches/release_29/test/SemaCXX/goto.cpp Fri Mar 25 00:42:19 2011
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -verify -fblocks %s
+// RUN: %clang_cc1 -fsyntax-only -verify -Wall -fblocks %s
 
 // PR9463
 double *end;
@@ -31,7 +31,7 @@
   end:
     ::end = 0;
   }
- end:
+ end: // expected-warning{{unused label 'end'}}
   end = 1;
 }
 
@@ -66,4 +66,14 @@
   }
 }
 
+extern "C" {
+  void exit(int);
+}
 
+void f() {
+  {
+    goto exit;
+  }
+ exit:
+  return;
+}

Propchange: cfe/branches/release_29/test/SemaCXX/warn-unreachable.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 25 00:42:19 2011
@@ -1 +1 @@
-/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,127238,127283,127308,127326,127329,127373,127405,127460,127507,127512,127541,127543,127563,127580,127582-127583,127622-127623,127652,127654-127655,127736-127738,127806,127811,127971,127980,128102,128104
+/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,127238,127283,127308,127326,127329,127373,127405,127460,127507,127512,127541,127543,127563,127580,127582-127583,127622-127623,127652,127654-127655,127736-127738,127806,127811,127971,127980,128102,128104,128210