From 0bbacf8d2b3c7a5f19f292f3201e371836445502 Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Wed, 5 Jan 2011 23:23:17 +0000 Subject: [PATCH] Fast-path an arity check when performing template argument deduction that compares two parameter-type-lists. No functionality change. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@122928 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/SemaTemplateDeduction.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/Sema/SemaTemplateDeduction.cpp b/lib/Sema/SemaTemplateDeduction.cpp index e762d34117..603a7efea5 100644 --- a/lib/Sema/SemaTemplateDeduction.cpp +++ b/lib/Sema/SemaTemplateDeduction.cpp @@ -541,8 +541,12 @@ DeduceTemplateArguments(Sema &S, TemplateDeductionInfo &Info, llvm::SmallVectorImpl &Deduced, unsigned TDF) { - // FIXME: Fast-path check with NumParams != NumArgs and there are no - // pack expansions around. + // Fast-path check to see if we have too many/too few arguments. + if (NumParams != NumArgs && + !(NumParams && isa(Params[NumParams - 1])) && + !(NumArgs && isa(Args[NumArgs - 1]))) + return NumArgs < NumParams ? Sema::TDK_TooFewArguments + : Sema::TDK_TooManyArguments; // C++0x [temp.deduct.type]p10: // Similarly, if P has a form that contains (T), then each parameter type -- 2.50.1