[llvm-commits] [llvm] r64953 - in /llvm/trunk: lib/AsmParser/LLParser.cpp lib/VMCore/AsmWriter.cpp test/Assembler/anon-functions.ll
Chris Lattner
sabre at nondot.org
Wed Feb 18 13:48:14 PST 2009
Author: lattner
Date: Wed Feb 18 15:48:13 2009
New Revision: 64953
URL: http://llvm.org/viewvc/llvm-project?rev=64953&view=rev
Log:
add proper asmwriter and asmparser support for anonymous functions.
Added:
llvm/trunk/test/Assembler/anon-functions.ll
Modified:
llvm/trunk/lib/AsmParser/LLParser.cpp
llvm/trunk/lib/VMCore/AsmWriter.cpp
Modified: llvm/trunk/lib/AsmParser/LLParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLParser.cpp?rev=64953&r1=64952&r2=64953&view=diff
==============================================================================
--- llvm/trunk/lib/AsmParser/LLParser.cpp (original)
+++ llvm/trunk/lib/AsmParser/LLParser.cpp Wed Feb 18 15:48:13 2009
@@ -2094,11 +2094,21 @@
isa<OpaqueType>(RetType))
return Error(RetTypeLoc, "invalid function return type");
- if (Lex.getKind() != lltok::GlobalVar)
+ LocTy NameLoc = Lex.getLoc();
+
+ 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");
+ }
- LocTy NameLoc = Lex.getLoc();
- std::string FunctionName = Lex.getStrVal();
Lex.Lex();
if (Lex.getKind() != lltok::lparen)
Modified: llvm/trunk/lib/VMCore/AsmWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/AsmWriter.cpp?rev=64953&r1=64952&r2=64953&view=diff
==============================================================================
--- llvm/trunk/lib/VMCore/AsmWriter.cpp (original)
+++ llvm/trunk/lib/VMCore/AsmWriter.cpp Wed Feb 18 15:48:13 2009
@@ -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);
Added: llvm/trunk/test/Assembler/anon-functions.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/anon-functions.ll?rev=64953&view=auto
==============================================================================
--- llvm/trunk/test/Assembler/anon-functions.ll (added)
+++ llvm/trunk/test/Assembler/anon-functions.ll Wed Feb 18 15:48:13 2009
@@ -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"
+
+ at f = alias void ()* @0 ; <void ()*> [#uses=0]
+ at g = alias void ()* @1 ; <void ()*> [#uses=0]
+ at 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
+}
More information about the llvm-commits
mailing list