add proper asmwriter and asmparser support for anonymous functions.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@64953 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AsmParser/LLParser.cpp b/lib/AsmParser/LLParser.cpp
index cddb343..abddc59 100644
--- a/lib/AsmParser/LLParser.cpp
+++ b/lib/AsmParser/LLParser.cpp
@@ -2094,11 +2094,21 @@
isa<OpaqueType>(RetType))
return Error(RetTypeLoc, "invalid function return type");
- if (Lex.getKind() != lltok::GlobalVar)
- return TokError("expected function name");
-
LocTy NameLoc = Lex.getLoc();
- std::string FunctionName = Lex.getStrVal();
+
+ std::string FunctionName;
+ if (Lex.getKind() == lltok::GlobalVar) {
+ FunctionName = Lex.getStrVal();
+ } else if (Lex.getKind() == lltok::GlobalID) { // @42 is ok.
+ unsigned NameID = Lex.getUIntVal();
+
+ if (NameID != NumberedVals.size())
+ return TokError("function expected to be numbered '%" +
+ utostr(NumberedVals.size()) + "'");
+ } else {
+ return TokError("expected function name");
+ }
+
Lex.Lex();
if (Lex.getKind() != lltok::lparen)
diff --git a/lib/VMCore/AsmWriter.cpp b/lib/VMCore/AsmWriter.cpp
index 6718da4..68cf438 100644
--- a/lib/VMCore/AsmWriter.cpp
+++ b/lib/VMCore/AsmWriter.cpp
@@ -1240,10 +1240,7 @@
printType(F->getFunctionType());
Out << "* ";
- if (F->hasName())
- PrintLLVMName(Out, F);
- else
- Out << "@\"\"";
+ WriteAsOperandInternal(Out, F, TypeNames, &Machine);
} else if (const GlobalAlias *GA = dyn_cast<GlobalAlias>(Aliasee)) {
printType(GA->getType());
Out << " ";
@@ -1310,10 +1307,7 @@
Out << Attribute::getAsString(Attrs.getRetAttributes()) << ' ';
printType(F->getReturnType());
Out << ' ';
- if (F->hasName())
- PrintLLVMName(Out, F);
- else
- Out << "@\"\"";
+ WriteAsOperandInternal(Out, F, TypeNames, &Machine);
Out << '(';
Machine.incorporateFunction(F);
diff --git a/test/Assembler/anon-functions.ll b/test/Assembler/anon-functions.ll
new file mode 100644
index 0000000..e08063e
--- /dev/null
+++ b/test/Assembler/anon-functions.ll
@@ -0,0 +1,26 @@
+; RUN: llvm-as < %s |llvm-dis | llvm-as | llvm-dis
+; PR3611
+
+target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128"
+target triple = "x86_64-unknown-linux-gnu"
+
+@f = alias void ()* @0 ; <void ()*> [#uses=0]
+@g = alias void ()* @1 ; <void ()*> [#uses=0]
+@h = external global void ()* ; <void ()*> [#uses=0]
+
+define internal void @0() nounwind {
+entry:
+ store void()* @0, void()** @h
+ br label %return
+
+return: ; preds = %entry
+ ret void
+}
+
+define internal void @1() nounwind {
+entry:
+ br label %return
+
+return: ; preds = %entry
+ ret void
+}