[llvm-branch-commits] [cfe-branch] r168888 - in /cfe/branches/release_32: ./ lib/Sema/SemaOverload.cpp test/SemaTemplate/instantiate-overload-candidates.cpp

[Pawel Wodnicki]

Author: pawel
Date: Thu Nov 29 08:56:07 2012
New Revision: 168888

URL: http://llvm.org/viewvc/llvm-project?rev=168888&view=rev
Log:
Merging r167918: into the 3.2 release branch.

When we have a MemberExpr referring to an overloaded static member function,
and we resolve it to a specific function based on the type which it's used as,
don't forget to mark it as referenced.

Fixes a regression introduced in r167514.

Modified:
    cfe/branches/release_32/   (props changed)
    cfe/branches/release_32/lib/Sema/SemaOverload.cpp
    cfe/branches/release_32/test/SemaTemplate/instantiate-overload-candidates.cpp

Propchange: cfe/branches/release_32/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 29 08:56:07 2012
@@ -1,3 +1,3 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:167749,167762,167780,167788,167790,167813-167814,167868,167884,167920,167925,167935,168024,168063,168124,168269,168277-168278,168297,168303,168355,168379,168674,168818
+/cfe/trunk:167749,167762,167780,167788,167790,167813-167814,167868,167884,167918,167920,167925,167935,168024,168063,168124,168269,168277-168278,168297,168303,168355,168379,168674,168818
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_32/lib/Sema/SemaOverload.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_32/lib/Sema/SemaOverload.cpp?rev=168888&r1=168887&r2=168888&view=diff
==============================================================================
--- cfe/branches/release_32/lib/Sema/SemaOverload.cpp (original)
+++ cfe/branches/release_32/lib/Sema/SemaOverload.cpp Thu Nov 29 08:56:07 2012
@@ -11531,6 +11531,7 @@
                                         TemplateArgs,
                                         type, valueKind, OK_Ordinary);
     ME->setHadMultipleCandidates(true);
+    MarkMemberReferenced(ME);
     return ME;
   }
 

Modified: cfe/branches/release_32/test/SemaTemplate/instantiate-overload-candidates.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_32/test/SemaTemplate/instantiate-overload-candidates.cpp?rev=168888&r1=168887&r2=168888&view=diff
==============================================================================
--- cfe/branches/release_32/test/SemaTemplate/instantiate-overload-candidates.cpp (original)
+++ cfe/branches/release_32/test/SemaTemplate/instantiate-overload-candidates.cpp Thu Nov 29 08:56:07 2012
@@ -49,4 +49,3 @@
   }
   template void f<void>(B);
 }
-