[llvm-commits] [llvm] r92290 - in /llvm/trunk: lib/AsmParser/LLParser.cpp test/Assembler/metadata.ll
Chris Lattner
sabre at nondot.org
Tue Dec 29 20:13:37 PST 2009
Author: lattner
Date: Tue Dec 29 22:13:37 2009
New Revision: 92290
URL: http://llvm.org/viewvc/llvm-project?rev=92290&view=rev
Log:
fix parsing of mdstring values.
Modified:
llvm/trunk/lib/AsmParser/LLParser.cpp
llvm/trunk/test/Assembler/metadata.ll
Modified: llvm/trunk/lib/AsmParser/LLParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLParser.cpp?rev=92290&r1=92289&r2=92290&view=diff
==============================================================================
--- llvm/trunk/lib/AsmParser/LLParser.cpp (original)
+++ llvm/trunk/lib/AsmParser/LLParser.cpp Tue Dec 29 22:13:37 2009
@@ -1888,7 +1888,7 @@
ID.StrVal = Lex.getStrVal();
ID.Kind = ValID::t_LocalName;
break;
- case lltok::Metadata: { // !{...} MDNode, !"foo" MDString
+ case lltok::Metadata: // !{...} MDNode, !"foo" MDString
Lex.Lex();
// FIXME: This doesn't belong here.
@@ -1905,20 +1905,17 @@
// Standalone metadata reference
// !{ ..., !42, ... }
- // FIXME: Split MetadataVal into one for MDNode and one for MDString.
- if (!ParseMDNode(ID.MDNodeVal)) {
+ if (Lex.getKind() == lltok::APSInt) {
+ if (ParseMDNode(ID.MDNodeVal)) return true;
ID.Kind = ValID::t_MDNode;
return false;
}
- // FIXME: This can't work.
-
// MDString:
// ::= '!' STRINGCONSTANT
if (ParseMDString(ID.MDStringVal)) return true;
ID.Kind = ValID::t_MDString;
return false;
- }
case lltok::APSInt:
ID.APSIntVal = Lex.getAPSIntVal();
ID.Kind = ValID::t_APSInt;
@@ -2473,7 +2470,7 @@
case ValID::t_LocalID: V = PFS.GetVal(ID.UIntVal, Ty, ID.Loc); break;
case ValID::t_LocalName: V = PFS.GetVal(ID.StrVal, Ty, ID.Loc); break;
case ValID::t_MDNode: V = ID.MDNodeVal; break;
- case ValID::t_MDString: V = ID.MDStringVal;
+ case ValID::t_MDString: V = ID.MDStringVal; break;
case ValID::t_InlineAsm: {
const PointerType *PTy = dyn_cast<PointerType>(Ty);
const FunctionType *FTy =
Modified: llvm/trunk/test/Assembler/metadata.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/metadata.ll?rev=92290&r1=92289&r2=92290&view=diff
==============================================================================
--- llvm/trunk/test/Assembler/metadata.ll (original)
+++ llvm/trunk/test/Assembler/metadata.ll Tue Dec 29 22:13:37 2009
@@ -2,8 +2,16 @@
define void @test() {
add i32 2, 1, !bar !0
add i32 1, 2, !foo !1
+
+ call void @llvm.dbg.func.start(metadata !"foo")
+
ret void, !foo !0, !bar !1
}
!0 = metadata !{i32 662302, i32 26, metadata !1, null}
!1 = metadata !{i32 4}
+
+declare void @llvm.dbg.func.start(metadata) nounwind readnone
+
+
+; !foo = !{ !0, !"foo" }
\ No newline at end of file
More information about the llvm-commits
mailing list