diff options
| -rw-r--r-- | clang/lib/CodeGen/CodeGenFunction.h | 2 | ||||
| -rw-r--r-- | clang/test/CodeGen/variadic-null-win64.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/CodeGenFunction.h b/clang/lib/CodeGen/CodeGenFunction.h index acf8863b580..1347f54df9a 100644 --- a/clang/lib/CodeGen/CodeGenFunction.h +++ b/clang/lib/CodeGen/CodeGenFunction.h @@ -3571,7 +3571,7 @@ public: // If we still have any arguments, emit them using the type of the argument. for (auto *A : llvm::make_range(Arg, ArgRange.end())) - ArgTypes.push_back(getVarArgType(A)); + ArgTypes.push_back(CallArgTypeInfo ? getVarArgType(A) : A->getType()); EmitCallArgs(Args, ArgTypes, ArgRange, CalleeDecl, ParamsToSkip, Order); } diff --git a/clang/test/CodeGen/variadic-null-win64.c b/clang/test/CodeGen/variadic-null-win64.c index 3e079cbf8e5..3b2a3707bad 100644 --- a/clang/test/CodeGen/variadic-null-win64.c +++ b/clang/test/CodeGen/variadic-null-win64.c @@ -3,15 +3,21 @@ // Make it possible to pass NULL through variadic functions on platforms where // NULL has an integer type that is more narrow than a pointer. On such -// platforms we widen null pointer constants to a pointer-sized integer. +// platforms we widen null pointer constants passed to variadic functions to a +// pointer-sized integer. We don't apply this special case to K&R-style +// unprototyped functions, because MSVC doesn't either. #define NULL 0 void v(const char *f, ...); +void kr(); void f(const char *f) { v(f, 1, 2, 3, NULL); + kr(f, 1, 2, 3, 0); } // WINDOWS: define void @f(i8* %f) // WINDOWS: call void (i8*, ...) @v(i8* {{.*}}, i32 1, i32 2, i32 3, i64 0) +// WINDOWS: call void bitcast (void (...)* @kr to void (i8*, i32, i32, i32, i32)*)(i8* {{.*}}, i32 1, i32 2, i32 3, i32 0) // LINUX: define void @f(i8* %f) // LINUX: call void (i8*, ...) @v(i8* {{.*}}, i32 1, i32 2, i32 3, i32 0) +// LINUX: call void (i8*, i32, i32, i32, i32, ...) bitcast (void (...)* @kr to void (i8*, i32, i32, i32, i32, ...)*)(i8* %1, i32 1, i32 2, i32 3, i32 0) |
