[llvm-commits] [llvm] r66504 - in /llvm/branches/Apple/Dib: lib/AsmParser/LLParser.cpp lib/VMCore/AsmWriter.cpp test/Assembler/anon-functions.ll

[Bill Wendling]

Author: void
Date: Mon Mar  9 18:36:56 2009
New Revision: 66504

URL: http://llvm.org/viewvc/llvm-project?rev=66504&view=rev
Log:
--- Merging (from foreign repository) r64953 into '.':
A    test/Assembler/anon-functions.ll
U    lib/VMCore/AsmWriter.cpp

Proper support for anonymous functions.

Added:
    llvm/branches/Apple/Dib/test/Assembler/anon-functions.ll
Modified:
    llvm/branches/Apple/Dib/lib/AsmParser/LLParser.cpp
    llvm/branches/Apple/Dib/lib/VMCore/AsmWriter.cpp

Modified: llvm/branches/Apple/Dib/lib/AsmParser/LLParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Dib/lib/AsmParser/LLParser.cpp?rev=66504&r1=66503&r2=66504&view=diff

==============================================================================
--- llvm/branches/Apple/Dib/lib/AsmParser/LLParser.cpp (original)
+++ llvm/branches/Apple/Dib/lib/AsmParser/LLParser.cpp Mon Mar  9 18:36:56 2009
@@ -2102,11 +2102,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/branches/Apple/Dib/lib/VMCore/AsmWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Dib/lib/VMCore/AsmWriter.cpp?rev=66504&r1=66503&r2=66504&view=diff

==============================================================================
--- llvm/branches/Apple/Dib/lib/VMCore/AsmWriter.cpp (original)
+++ llvm/branches/Apple/Dib/lib/VMCore/AsmWriter.cpp Mon Mar  9 18:36:56 2009
@@ -1242,10 +1242,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 << " ";
@@ -1312,10 +1309,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/branches/Apple/Dib/test/Assembler/anon-functions.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Dib/test/Assembler/anon-functions.ll?rev=66504&view=auto

==============================================================================
--- llvm/branches/Apple/Dib/test/Assembler/anon-functions.ll (added)
+++ llvm/branches/Apple/Dib/test/Assembler/anon-functions.ll Mon Mar  9 18:36:56 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
+}