Derive MDNode from MetadataBase instead of Constant. Emit MDNodes into METADATA_BLOCK in bitcode file.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@76834 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AsmParser/LLParser.cpp b/lib/AsmParser/LLParser.cpp
index 18f8323..097b385 100644
--- a/lib/AsmParser/LLParser.cpp
+++ b/lib/AsmParser/LLParser.cpp
@@ -379,20 +379,20 @@
// MDNode:
// ::= '!' MDNodeNumber
-bool LLParser::ParseMDNode(Constant *&Node) {
+bool LLParser::ParseMDNode(MetadataBase *&Node) {
// !{ ..., !42, ... }
unsigned MID = 0;
if (ParseUInt32(MID)) return true;
// Check existing MDNode.
- std::map<unsigned, Constant *>::iterator I = MetadataCache.find(MID);
+ std::map<unsigned, MetadataBase *>::iterator I = MetadataCache.find(MID);
if (I != MetadataCache.end()) {
Node = I->second;
return false;
}
// Check known forward references.
- std::map<unsigned, std::pair<Constant *, LocTy> >::iterator
+ std::map<unsigned, std::pair<MetadataBase *, LocTy> >::iterator
FI = ForwardRefMDNodes.find(MID);
if (FI != ForwardRefMDNodes.end()) {
Node = FI->second.first;
@@ -427,15 +427,24 @@
if (ParseType(Ty, TyLoc))
return true;
- Constant *Init = 0;
- if (ParseGlobalValue(Ty, Init))
- return true;
+ if (Lex.getKind() != lltok::Metadata)
+ return TokError("Expected metadata here");
+ Lex.Lex();
+ if (Lex.getKind() != lltok::lbrace)
+ return TokError("Expected '{' here");
+
+ SmallVector<Value *, 16> Elts;
+ if (ParseMDNodeVector(Elts)
+ || ParseToken(lltok::rbrace, "exected end of metadata node"))
+ return true;
+
+ MDNode *Init = Context.getMDNode(Elts.data(), Elts.size());
MetadataCache[MetadataID] = Init;
- std::map<unsigned, std::pair<Constant *, LocTy> >::iterator
+ std::map<unsigned, std::pair<MetadataBase *, LocTy> >::iterator
FI = ForwardRefMDNodes.find(MetadataID);
if (FI != ForwardRefMDNodes.end()) {
- Constant *FwdNode = FI->second.first;
+ MDNode *FwdNode = cast<MDNode>(FI->second.first);
FwdNode->replaceAllUsesWith(Init);
ForwardRefMDNodes.erase(FI);
}
@@ -1677,7 +1686,7 @@
ID.Kind = ValID::t_LocalName;
break;
case lltok::Metadata: { // !{...} MDNode, !"foo" MDString
- ID.Kind = ValID::t_Constant;
+ ID.Kind = ValID::t_Metadata;
Lex.Lex();
if (Lex.getKind() == lltok::lbrace) {
SmallVector<Value*, 16> Elts;
@@ -1685,13 +1694,13 @@
ParseToken(lltok::rbrace, "expected end of metadata node"))
return true;
- ID.ConstantVal = Context.getMDNode(Elts.data(), Elts.size());
+ ID.MetadataVal = Context.getMDNode(Elts.data(), Elts.size());
return false;
}
// Standalone metadata reference
// !{ ..., !42, ... }
- if (!ParseMDNode(ID.ConstantVal))
+ if (!ParseMDNode(ID.MetadataVal))
return false;
// MDString:
@@ -3462,7 +3471,7 @@
if (ParseType(Ty)) return true;
if (Lex.getKind() == lltok::Metadata) {
Lex.Lex();
- Constant *Node = 0;
+ MetadataBase *Node = 0;
if (!ParseMDNode(Node))
V = Node;
else {
diff --git a/lib/AsmParser/LLParser.h b/lib/AsmParser/LLParser.h
index 1a0b6cc..c77ef9d 100644
--- a/lib/AsmParser/LLParser.h
+++ b/lib/AsmParser/LLParser.h
@@ -46,8 +46,8 @@
std::map<unsigned, std::pair<PATypeHolder, LocTy> > ForwardRefTypeIDs;
std::vector<PATypeHolder> NumberedTypes;
/// MetadataCache - This map keeps track of parsed metadata constants.
- std::map<unsigned, Constant *> MetadataCache;
- std::map<unsigned, std::pair<Constant *, LocTy> > ForwardRefMDNodes;
+ std::map<unsigned, MetadataBase *> MetadataCache;
+ std::map<unsigned, std::pair<MetadataBase *, LocTy> > ForwardRefMDNodes;
struct UpRefRecord {
/// Loc - This is the location of the upref.
@@ -149,7 +149,7 @@
bool ParseAlias(const std::string &Name, LocTy Loc, unsigned Visibility);
bool ParseStandaloneMetadata();
bool ParseMDString(MetadataBase *&S);
- bool ParseMDNode(Constant *&N);
+ bool ParseMDNode(MetadataBase *&N);
// Type Parsing.
bool ParseType(PATypeHolder &Result, bool AllowVoid = false);