diff options
Diffstat (limited to 'clang/lib/Sema')
| -rw-r--r-- | clang/lib/Sema/SemaExpr.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaLookup.cpp | 3 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaTemplate.cpp | 16 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaTemplateInstantiateExpr.cpp | 3 |
4 files changed, 17 insertions, 7 deletions
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp index dd5bfc4e880..f9abb3dbd93 100644 --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -2701,6 +2701,8 @@ Sema::ActOnCallExpr(Scope *S, ExprArg fn, SourceLocation LParenLoc, } else if (TemplateIdRefExpr *TemplateIdRef = dyn_cast<TemplateIdRefExpr>(FnExpr)) { NDecl = TemplateIdRef->getTemplateName().getAsTemplateDecl(); + if (!NDecl) + NDecl = TemplateIdRef->getTemplateName().getAsOverloadedFunctionDecl(); HasExplicitTemplateArgs = true; ExplicitTemplateArgs = TemplateIdRef->getTemplateArgs(); NumExplicitTemplateArgs = TemplateIdRef->getNumTemplateArgs(); diff --git a/clang/lib/Sema/SemaLookup.cpp b/clang/lib/Sema/SemaLookup.cpp index 57656ce8afe..9f1ea4efd76 100644 --- a/clang/lib/Sema/SemaLookup.cpp +++ b/clang/lib/Sema/SemaLookup.cpp @@ -1596,8 +1596,7 @@ Sema::FindAssociatedClassesAndNamespaces(Expr **Args, unsigned NumArgs, if (DRE) Ovl = dyn_cast<OverloadedFunctionDecl>(DRE->getDecl()); else if (TIRE) - Ovl = dyn_cast_or_null<OverloadedFunctionDecl>( - TIRE->getTemplateName().getAsTemplateDecl()); + Ovl = TIRE->getTemplateName().getAsOverloadedFunctionDecl(); if (!Ovl) continue; diff --git a/clang/lib/Sema/SemaTemplate.cpp b/clang/lib/Sema/SemaTemplate.cpp index 0300093fa4a..245ba3f8f20 100644 --- a/clang/lib/Sema/SemaTemplate.cpp +++ b/clang/lib/Sema/SemaTemplate.cpp @@ -93,10 +93,18 @@ TemplateNameKind Sema::isTemplateName(const IdentifierInfo &II, Scope *S, if (isa<FunctionTemplateDecl>(*F)) OvlTemplate->addOverload(*F); } - - // FIXME: HACK! We need TemplateName to be able to refer to - // sets of overloaded function templates. - TemplateResult = TemplateTy::make(OvlTemplate); + + // Form the resulting TemplateName + if (SS && SS->isSet() && !SS->isInvalid()) { + NestedNameSpecifier *Qualifier + = static_cast<NestedNameSpecifier *>(SS->getScopeRep()); + TemplateResult + = TemplateTy::make(Context.getQualifiedTemplateName(Qualifier, + false, + OvlTemplate)); + } else { + TemplateResult = TemplateTy::make(TemplateName(OvlTemplate)); + } return TNK_Function_template; } diff --git a/clang/lib/Sema/SemaTemplateInstantiateExpr.cpp b/clang/lib/Sema/SemaTemplateInstantiateExpr.cpp index dcf2ebcd2ee..31c184fbc28 100644 --- a/clang/lib/Sema/SemaTemplateInstantiateExpr.cpp +++ b/clang/lib/Sema/SemaTemplateInstantiateExpr.cpp @@ -109,7 +109,8 @@ TemplateExprInstantiator::VisitUnresolvedFunctionNameExpr( Sema::OwningExprResult TemplateExprInstantiator::VisitTemplateIdRefExpr(TemplateIdRefExpr *E) { TemplateName Template - = SemaRef.InstantiateTemplateName(E->getTemplateName(), E->getTemplateNameLoc(), + = SemaRef.InstantiateTemplateName(E->getTemplateName(), + E->getTemplateNameLoc(), TemplateArgs); // FIXME: Can InstantiateTemplateName report an error? |
