[cfe-commits] r127061 - in /cfe/trunk: lib/Sema/SemaExpr.cpp test/SemaCXX/member-expr.cpp

[Matt Beaumont-Gay]

Author: matthewbg
Date: Fri Mar  4 20:42:30 2011
New Revision: 127061

URL: http://llvm.org/viewvc/llvm-project?rev=127061&view=rev
Log:
Much to my surprise, OverloadExprs can also point to function template decls.

Modified:
    cfe/trunk/lib/Sema/SemaExpr.cpp
    cfe/trunk/test/SemaCXX/member-expr.cpp

Modified: cfe/trunk/lib/Sema/SemaExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExpr.cpp?rev=127061&r1=127060&r2=127061&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaExpr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExpr.cpp Fri Mar  4 20:42:30 2011
@@ -4017,21 +4017,24 @@
     bool HasViableZeroArgOverload = false;
     for (OverloadExpr::decls_iterator it = AllOverloads.begin(),
          DeclsEnd = AllOverloads.end(); it != DeclsEnd; ++it) {
-      const FunctionDecl *OverloadDecl = cast<FunctionDecl>(*it);
-      QualType ResultTy = OverloadDecl->getResultType();
-      if ((!IsArrow && ResultTy->isRecordType()) ||
-          (IsArrow && ResultTy->isPointerType() &&
-           ResultTy->getPointeeType()->isRecordType())) {
-        ViableOverloads.addDecl(*it);
-        if (OverloadDecl->getMinRequiredArguments() == 0) {
-          HasViableZeroArgOverload = true;
+      // Our overload set may include TemplateDecls, which we'll ignore for the
+      // purposes of determining whether we can issue a '()' fixit.
+      if (const FunctionDecl *OverloadDecl = dyn_cast<FunctionDecl>(*it)) {
+        QualType ResultTy = OverloadDecl->getResultType();
+        if ((!IsArrow && ResultTy->isRecordType()) ||
+            (IsArrow && ResultTy->isPointerType() &&
+             ResultTy->getPointeeType()->isRecordType())) {
+          ViableOverloads.addDecl(*it);
+          if (OverloadDecl->getMinRequiredArguments() == 0) {
+            HasViableZeroArgOverload = true;
+          }
         }
       }
     }
 
     if (!HasViableZeroArgOverload || ViableOverloads.size() != 1) {
       Diag(BaseExpr->getExprLoc(), diag::err_member_reference_needs_call)
-          << 1 << 0
+          << (AllOverloads.size() > 1) << 0
           << BaseExpr->getSourceRange();
       int ViableOverloadCount = ViableOverloads.size();
       int I;

Modified: cfe/trunk/test/SemaCXX/member-expr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/member-expr.cpp?rev=127061&r1=127060&r2=127061&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/member-expr.cpp (original)
+++ cfe/trunk/test/SemaCXX/member-expr.cpp Fri Mar  4 20:42:30 2011
@@ -135,4 +135,9 @@
   int g3() {
     return fun3.x; // expected-error{{base of member reference is an overloaded function; perhaps you meant to call it with no arguments?}}
   }
+
+  template <typename T> S fun4();
+  int g4() {
+    return fun4.x; // expected-error{{base of member reference is a function; perhaps you meant to call it?}}
+  }
 }