summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@mac.com>2009-04-01 00:15:23 +0000
committerAnders Carlsson <andersca@mac.com>2009-04-01 00:15:23 +0000
commit7a6f8b928116c08d4a3c67d0a4e7b0afdcc4d833 (patch)
tree5c55b4abf1a941439a61eab5a20acefd1cd7ebd9
parent08b216abf13a3c81b1b5312c162d44793677397f (diff)
downloadbcm5719-llvm-7a6f8b928116c08d4a3c67d0a4e7b0afdcc4d833.tar.gz
bcm5719-llvm-7a6f8b928116c08d4a3c67d0a4e7b0afdcc4d833.zip
Fix a mangling bug where functions with no arguments weren't getting the 'v' parameter specifier.
llvm-svn: 68162
-rw-r--r--clang/lib/CodeGen/Mangle.cpp5
-rw-r--r--clang/test/CodeGenCXX/mangle.cpp2
2 files changed, 7 insertions, 0 deletions
diff --git a/clang/lib/CodeGen/Mangle.cpp b/clang/lib/CodeGen/Mangle.cpp
index 7a7a480bdb0..427cc76646b 100644
--- a/clang/lib/CodeGen/Mangle.cpp
+++ b/clang/lib/CodeGen/Mangle.cpp
@@ -477,6 +477,11 @@ void CXXNameMangler::mangleBareFunctionType(const FunctionType *T,
const FunctionProtoType *Proto = dyn_cast<FunctionProtoType>(T);
assert(Proto && "Can't mangle K&R function prototypes");
+ if (Proto->getNumArgs() == 0) {
+ Out << 'v';
+ return;
+ }
+
for (FunctionProtoType::arg_type_iterator Arg = Proto->arg_type_begin(),
ArgEnd = Proto->arg_type_end();
Arg != ArgEnd; ++Arg)
diff --git a/clang/test/CodeGenCXX/mangle.cpp b/clang/test/CodeGenCXX/mangle.cpp
index 855a2ae0a46..7acb31cc69e 100644
--- a/clang/test/CodeGenCXX/mangle.cpp
+++ b/clang/test/CodeGenCXX/mangle.cpp
@@ -24,3 +24,5 @@ void f(u) { }
typedef struct { int a; } x,y;
void f(y) { }
+// RUN: grep _Z1fv %t | count 1
+void f() { }
OpenPOWER on IntegriCloud