diff options
author | Devang Patel <dpatel@apple.com> | 2009-09-29 20:30:57 +0000 |
---|---|---|
committer | Devang Patel <dpatel@apple.com> | 2009-09-29 20:30:57 +0000 |
commit | 58a230a4917592f5c529cb40e75bfc3e1c681b69 (patch) | |
tree | b2f31e6fba7970c32de4cfccd755ed35a1188b6b /lib | |
parent | a9a9c95f6789946d5df34185725fc28cebad8b16 (diff) | |
download | external_llvm-58a230a4917592f5c529cb40e75bfc3e1c681b69.zip external_llvm-58a230a4917592f5c529cb40e75bfc3e1c681b69.tar.gz external_llvm-58a230a4917592f5c529cb40e75bfc3e1c681b69.tar.bz2 |
Only one custom meadata of each kind can be attached with an instruction.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@83105 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/AsmParser/LLParser.cpp | 2 | ||||
-rw-r--r-- | lib/Bitcode/Reader/BitcodeReader.cpp | 2 | ||||
-rw-r--r-- | lib/VMCore/Metadata.cpp | 28 |
3 files changed, 21 insertions, 11 deletions
diff --git a/lib/AsmParser/LLParser.cpp b/lib/AsmParser/LLParser.cpp index 9e80159..42ce953 100644 --- a/lib/AsmParser/LLParser.cpp +++ b/lib/AsmParser/LLParser.cpp @@ -2665,7 +2665,7 @@ bool LLParser::ParseBasicBlock(PerFunctionState &PFS) { MetadataContext &TheMetadata = M->getContext().getMetadata(); for (SmallVector<std::pair<unsigned, MDNode *>, 2>::iterator MDI = MDsOnInst.begin(), MDE = MDsOnInst.end(); MDI != MDE; ++MDI) - TheMetadata.setMD(MDI->first, MDI->second, Inst); + TheMetadata.addMD(MDI->first, MDI->second, Inst); MDsOnInst.clear(); BB->getInstList().push_back(Inst); diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp index f5ddd3f..fe0366f 100644 --- a/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/lib/Bitcode/Reader/BitcodeReader.cpp @@ -1582,7 +1582,7 @@ bool BitcodeReader::ParseMetadataAttachment() { for (unsigned i = 1; i != RecordLength; i = i+2) { unsigned Kind = Record[i]; Value *Node = MDValueList.getValueFwdRef(Record[i+1]); - TheMetadata.setMD(Kind, cast<MDNode>(Node), Inst); + TheMetadata.addMD(Kind, cast<MDNode>(Node), Inst); } break; } diff --git a/lib/VMCore/Metadata.cpp b/lib/VMCore/Metadata.cpp index 0a8e865..6e2fc3f 100644 --- a/lib/VMCore/Metadata.cpp +++ b/lib/VMCore/Metadata.cpp @@ -300,18 +300,29 @@ unsigned MetadataContext::getMDKind(const char *Name) { return I->getValue(); } -/// setMD - Attach the metadata of given kind with an Instruction. -void MetadataContext::setMD(unsigned MDKind, MDNode *Node, Instruction *Inst) { - MDStoreTy::iterator I = MetadataStore.find(Inst); +/// addMD - Attach the metadata of given kind with an Instruction. +void MetadataContext::addMD(unsigned MDKind, MDNode *Node, Instruction *Inst) { + assert (Node && "Unable to add custome metadata"); Inst->HasMetadata = true; + MDStoreTy::iterator I = MetadataStore.find(Inst); if (I == MetadataStore.end()) { MDMapTy Info; Info.push_back(std::make_pair(MDKind, Node)); MetadataStore.insert(std::make_pair(Inst, Info)); return; } - + MDMapTy &Info = I->second; + // If there is an entry for this MDKind then replace it. + for (unsigned i = 0, e = Info.size(); i != e; ++i) { + MDPairTy &P = Info[i]; + if (P.first == MDKind) { + Info[i] = std::make_pair(MDKind, Node); + return; + } + } + + // Otherwise add a new entry. Info.push_back(std::make_pair(MDKind, Node)); return; } @@ -319,16 +330,15 @@ void MetadataContext::setMD(unsigned MDKind, MDNode *Node, Instruction *Inst) { /// getMD - Get the metadata of given kind attached with an Instruction. /// If the metadata is not found then return 0. MDNode *MetadataContext::getMD(unsigned MDKind, const Instruction *Inst) { - MDNode *Node = NULL; MDStoreTy::iterator I = MetadataStore.find(Inst); if (I == MetadataStore.end()) - return Node; + return NULL; MDMapTy &Info = I->second; for (MDMapTy::iterator I = Info.begin(), E = Info.end(); I != E; ++I) if (I->first == MDKind) - Node = dyn_cast_or_null<MDNode>(I->second); - return Node; + return dyn_cast_or_null<MDNode>(I->second); + return NULL; } /// getMDs - Get the metadata attached with an Instruction. @@ -374,5 +384,5 @@ void MetadataContext::ValueIsCloned(const Instruction *In1, Instruction *In2) { MDMapTy In2Info; for (MDMapTy::iterator I = In1Info.begin(), E = In1Info.end(); I != E; ++I) if (MDNode *MD = dyn_cast_or_null<MDNode>(I->second)) - setMD(I->first, MD, In2); + addMD(I->first, MD, In2); } |