diff --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp --- a/clang/lib/Sema/SemaChecking.cpp +++ b/clang/lib/Sema/SemaChecking.cpp @@ -1649,11 +1649,18 @@ case Builtin::BI__builtin_nontemporal_store: return SemaBuiltinNontemporalOverloaded(TheCallResult); case Builtin::BI__builtin_memcpy_inline: { + clang::Expr *DstOp = TheCall->getArg(0); + clang::Expr *SrcOp = TheCall->getArg(1); + clang::Expr *SizeOp = TheCall->getArg(2); + // If any arg is instantiation dependent we bail out. + if (DstOp->isInstantiationDependent() || + SrcOp->isInstantiationDependent() || SizeOp->isInstantiationDependent()) + break; // __builtin_memcpy_inline size argument is a constant by definition. - if (TheCall->getArg(2)->EvaluateKnownConstInt(Context).isNullValue()) + if (SizeOp->EvaluateKnownConstInt(Context).isNullValue()) break; - CheckNonNullArgument(*this, TheCall->getArg(0), TheCall->getExprLoc()); - CheckNonNullArgument(*this, TheCall->getArg(1), TheCall->getExprLoc()); + CheckNonNullArgument(*this, DstOp, TheCall->getExprLoc()); + CheckNonNullArgument(*this, SrcOp, TheCall->getExprLoc()); break; } #define BUILTIN(ID, TYPE, ATTRS) diff --git a/clang/test/Sema/builtins-memcpy-inline.c b/clang/test/Sema/builtins-memcpy-inline.cpp rename from clang/test/Sema/builtins-memcpy-inline.c rename to clang/test/Sema/builtins-memcpy-inline.cpp --- a/clang/test/Sema/builtins-memcpy-inline.c +++ b/clang/test/Sema/builtins-memcpy-inline.cpp @@ -30,3 +30,9 @@ void test_memcpy_inline_non_constant_size(void *dst, const void *src, unsigned size) { __builtin_memcpy_inline(dst, src, size); // expected-error {{argument to '__builtin_memcpy_inline' must be a constant integer}} } + +template +void test_memcpy_inline_template(void *dst, const void *src) { + // we do not try to evaluate size in non intantiated templates. + __builtin_memcpy_inline(dst, src, size); +}