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.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_32@168888 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Sema/SemaOverload.cpp b/lib/Sema/SemaOverload.cpp
index e5a3deebc2fe3a5b7f3141de85a8ebe15d78d111..911187857fe18851c46c33fa1542876b376cd079 100644 (file)
--- a/lib/Sema/SemaOverload.cpp
+++ b/lib/Sema/SemaOverload.cpp
@@ -11531,6 +11531,7 @@ Expr *Sema::FixOverloadedFunctionReference(Expr *E, DeclAccessPair Found,
                                         TemplateArgs,
                                         type, valueKind, OK_Ordinary);
     ME->setHadMultipleCandidates(true);
+    MarkMemberReferenced(ME);
     return ME;
   }
 

diff --git a/test/SemaTemplate/instantiate-overload-candidates.cpp b/test/SemaTemplate/instantiate-overload-candidates.cpp
index d29460eb28763975f2f6950271f3ada0d926bcb5..7542dbd8ab9b23fea6ee050e3a67781e3e29d7b7 100644 (file)
--- a/test/SemaTemplate/instantiate-overload-candidates.cpp
+++ b/test/SemaTemplate/instantiate-overload-candidates.cpp
@@ -49,4 +49,3 @@ namespace PR13098 {
   }
   template void f<void>(B);
 }
-