fix a fixme: non-proto struct returning function definitions should be compiled
to something like:
define void @bar(%struct.foo* noalias sret %agg.result) nounwind {
instead of:
define void @bar(%struct.foo* noalias sret %agg.result, ...) nounwind {
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@67475 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp
index 4cd046d..6f745f2 100644
--- a/lib/CodeGen/CodeGenModule.cpp
+++ b/lib/CodeGen/CodeGenModule.cpp
@@ -859,10 +859,13 @@
// As a special case, make sure that definitions of K&R function
// "type foo()" aren't declared as varargs (which forces the backend
// to do unnecessary work).
- // FIXME: what about stret() functions, this doesn't handle them!?
- if (Ty->isVarArg() && Ty->getNumParams() == 0)
- Ty = llvm::FunctionType::get(Ty->getReturnType(),
- std::vector<const llvm::Type*>(), false);
+ if (D->getType()->isFunctionNoProtoType()) {
+ assert(Ty->isVarArg() && "Didn't lower type as expected");
+ // Due to stret, the lowered function could have arguments. Just create the
+ // same type as was lowered by ConvertType but strip off the varargs bit.
+ std::vector<const llvm::Type*> Args(Ty->param_begin(), Ty->param_end());
+ Ty = llvm::FunctionType::get(Ty->getReturnType(), Args, false);
+ }
// Get or create the prototype for teh function.
llvm::Constant *Entry = GetAddrOfFunction(D, Ty);
diff --git a/test/CodeGen/functions.c b/test/CodeGen/functions.c
index ad91826..3b50df7 100644
--- a/test/CodeGen/functions.c
+++ b/test/CodeGen/functions.c
@@ -27,5 +27,9 @@
void f2(void) {
f1(1, 2, 3);
}
-// RUN: grep 'define void @f1()' %t
+// RUN: grep 'define void @f1()' %t &&
void f1() {}
+
+// RUN: grep 'define .* @f3' %t | not grep -F '...'
+struct foo { int X, Y, Z; } f3() {
+}