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

[Daniel Dunbar]

Author: ddunbar
Date: Thu Aug 12 17:44:19 2010
New Revision: 110968

URL: http://llvm.org/viewvc/llvm-project?rev=110968&view=rev
Log:
--- Merging r110906 into 'src/tools/clang':
U    src/tools/clang/test/SemaCXX/linkage-spec.cpp
U    src/tools/clang/lib/Sema/SemaOverload.cpp


Modified:
    cfe/branches/Apple/whitney-IB/src/tools/clang/   (props changed)
    cfe/branches/Apple/whitney-IB/src/tools/clang/lib/Sema/SemaOverload.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 Thu Aug 12 17:44:19 2010
@@ -1 +1 @@
-/cfe/trunk:110882,110901
+/cfe/trunk:110882,110901,110906

Modified: cfe/branches/Apple/whitney-IB/src/tools/clang/lib/Sema/SemaOverload.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney-IB/src/tools/clang/lib/Sema/SemaOverload.cpp?rev=110968&r1=110967&r2=110968&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/src/tools/clang/lib/Sema/SemaOverload.cpp (original)
+++ cfe/branches/Apple/whitney-IB/src/tools/clang/lib/Sema/SemaOverload.cpp Thu Aug 12 17:44:19 2010
@@ -573,6 +573,11 @@
 
 bool Sema::IsOverload(FunctionDecl *New, FunctionDecl *Old,
                       bool UseUsingDeclRules) {
+  // If both of the functions are extern "C", then they are not
+  // overloads.
+  if (Old->isExternC() && New->isExternC())
+    return false;
+
   FunctionTemplateDecl *OldTemplate = Old->getDescribedFunctionTemplate();
   FunctionTemplateDecl *NewTemplate = New->getDescribedFunctionTemplate();
 

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=110968&r1=110967&r2=110968&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 Thu Aug 12 17:44:19 2010
@@ -57,3 +57,14 @@
 
 // PR6991
 extern "C" typedef int (*PutcFunc_t)(int);
+
+
+// PR7859
+extern "C" void pr7859_a(int) {} // expected-note {{previous definition}}
+extern "C" void pr7859_a(int) {} // expected-error {{redefinition}}
+
+extern "C" void pr7859_b() {} // expected-note {{previous definition}}
+extern "C" void pr7859_b(int) {} // expected-error {{conflicting}}
+
+extern "C" void pr7859_c(short) {} // expected-note {{previous definition}}
+extern "C" void pr7859_c(int) {} // expected-error {{conflicting}}