[llvm-branch-commits] [cfe-branch] r111245 - in /cfe/branches/Apple/whitney-IB/src/tools/clang: ./ lib/AST/Decl.cpp test/SemaCXX/linkage-spec.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Tue Aug 17 11:27:58 2010
New Revision: 111245

URL: http://llvm.org/viewvc/llvm-project?rev=111245&view=rev
Log:
--- Merging r111238 into 'src/tools/clang':
U    src/tools/clang/test/SemaCXX/linkage-spec.cpp
U    src/tools/clang/lib/AST/Decl.cpp


Modified:
    cfe/branches/Apple/whitney-IB/src/tools/clang/   (props changed)
    cfe/branches/Apple/whitney-IB/src/tools/clang/lib/AST/Decl.cpp
    cfe/branches/Apple/whitney-IB/src/tools/clang/test/SemaCXX/linkage-spec.cpp

Propchange: cfe/branches/Apple/whitney-IB/src/tools/clang/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 17 11:27:58 2010
@@ -1 +1 @@
-/cfe/trunk:110882,110901,110906,110933,110950,110979,111023,111233
+/cfe/trunk:110882,110901,110906,110933,110950,110979,111023,111233,111238

Modified: cfe/branches/Apple/whitney-IB/src/tools/clang/lib/AST/Decl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney-IB/src/tools/clang/lib/AST/Decl.cpp?rev=111245&r1=111244&r2=111245&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/src/tools/clang/lib/AST/Decl.cpp (original)
+++ cfe/branches/Apple/whitney-IB/src/tools/clang/lib/AST/Decl.cpp Tue Aug 17 11:27:58 2010
@@ -953,6 +953,9 @@
 
       break;
     }
+    
+    if (DC->isRecord())
+      break;
   }
 
   return false;

Modified: cfe/branches/Apple/whitney-IB/src/tools/clang/test/SemaCXX/linkage-spec.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney-IB/src/tools/clang/test/SemaCXX/linkage-spec.cpp?rev=111245&r1=111244&r2=111245&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/src/tools/clang/test/SemaCXX/linkage-spec.cpp (original)
+++ cfe/branches/Apple/whitney-IB/src/tools/clang/test/SemaCXX/linkage-spec.cpp Tue Aug 17 11:27:58 2010
@@ -68,3 +68,12 @@
 
 extern "C" void pr7859_c(short) {} // expected-note {{previous definition}}
 extern "C" void pr7859_c(int) {} // expected-error {{conflicting}}
+
+// <rdar://problem/8318976>
+extern "C" {
+  struct s0 {
+  private:
+    s0();
+    s0(const s0 &);
+  };
+}