aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/CodeGen/Mangle.cpp5
-rw-r--r--test/CodeGenCXX/mangle.cpp2
2 files changed, 7 insertions, 0 deletions
diff --git a/lib/CodeGen/Mangle.cpp b/lib/CodeGen/Mangle.cpp
index 7a7a480bdb..427cc76646 100644
--- a/lib/CodeGen/Mangle.cpp
+++ b/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/test/CodeGenCXX/mangle.cpp b/test/CodeGenCXX/mangle.cpp
index 855a2ae0a4..7acb31cc69 100644
--- a/test/CodeGenCXX/mangle.cpp
+++ b/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() { }