Improve diagnostics and template instantiation behavior when calling

an overloaded function call operator.

llvm-svn: 84745

clang/include/clang/Basic/Diagnostic.h

@@ -44,7 +44,7 @@ namespace clang {
       DIAG_START_PARSE    = DIAG_START_LEX      +  300,
       DIAG_START_AST      = DIAG_START_PARSE    +  300,
       DIAG_START_SEMA     = DIAG_START_AST      +  100,
-      DIAG_START_ANALYSIS = DIAG_START_SEMA     + 1000,
+      DIAG_START_ANALYSIS = DIAG_START_SEMA     + 1100,
       DIAG_UPPER_LIMIT    = DIAG_START_ANALYSIS +  100
     };
 

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -1746,6 +1746,8 @@ def err_not_tag_in_scope : Error<
 
 def err_cannot_form_pointer_to_member_of_reference_type : Error<
   "cannot form a pointer-to-member to member %0 of reference type %1">;
+def err_incomplete_object_call : Error<
+  "incomplete type in call to object of type %0">;
   
 def warn_condition_is_assignment : Warning<"using the result of an "
   "assignment as a condition without parentheses">,

clang/lib/Sema/SemaOverload.cpp

@@ -5086,6 +5086,11 @@ Sema::BuildCallToObjectOfClassType(Scope *S, Expr *Object,
     AddMethodCandidate(cast<CXXMethodDecl>(*Oper), Object, Args, NumArgs,
                        CandidateSet, /*SuppressUserConversions=*/false);
 
+  if (RequireCompleteType(LParenLoc, Object->getType(), 
+                          PartialDiagnostic(diag::err_incomplete_object_call)
+                            << Object->getSourceRange()))
+    return true;
+  
   // C++ [over.call.object]p2:
   //   In addition, for each conversion function declared in T of the
   //   form
@@ -5103,8 +5108,6 @@ Sema::BuildCallToObjectOfClassType(Scope *S, Expr *Object,
   //   functions for each conversion function declared in an
   //   accessible base class provided the function is not hidden
   //   within T by another intervening declaration.
-
-  if (!RequireCompleteType(SourceLocation(), Object->getType(), 0)) {
   // FIXME: Look in base classes for more conversion operators!
   OverloadedFunctionDecl *Conversions
     = cast<CXXRecordDecl>(Record->getDecl())->getConversionFunctions();
@@ -5130,7 +5133,6 @@ Sema::BuildCallToObjectOfClassType(Scope *S, Expr *Object,
     if (const FunctionProtoType *Proto = ConvType->getAs<FunctionProtoType>())
       AddSurrogateCandidate(Conv, Proto, Object, Args, NumArgs, CandidateSet);
   }
-  }
 
   // Perform overload resolution.
   OverloadCandidateSet::iterator Best;

clang/test/SemaCXX/incomplete-call.cpp

@@ -40,3 +40,10 @@ void g() {
   (b.*mfp)(); // expected-error {{calling function with incomplete return type 'struct A'}}
   
 }
+
+
+struct C; // expected-note{{forward declaration}}
+
+void test_incomplete_object_call(C& c) {
+  c(); // expected-error{{incomplete type in call to object of type}}
+}