RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-23 19:23:23 +01:00
Code Issues Projects Releases Wiki Activity

Fix getHandlerNames() interface. Now it populate clinet supplied small vector with handler names.

Browse Source 
llvm-svn: 84820
This commit is contained in:
Devang Patel 2009-10-22 01:01:24 +00:00
parent e38519a01a
commit 6df2865e24
4 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/llvm/Metadata.h
View File

@ -287,7 +287,7 @@ public:
/// getHandlerNames - Get handler names. This is used by bitcode
/// writer.
const StringMap<unsigned> *getHandlerNames();
void getHandlerNames(SmallVectorImpl<std::pair<unsigned, StringRef> >&N) const;
/// ValueIsDeleted - This handler is used to update metadata store
/// when a value is deleted.

12
lib/Bitcode/Writer/BitcodeWriter.cpp
View File

@ -602,11 +602,13 @@ static void WriteModuleMetadataStore(const Module *M,
// Write metadata kinds
// METADATA_KIND - [n x [id, name]]
MetadataContext &TheMetadata = M->getContext().getMetadata();
const StringMap<unsigned> *Kinds = TheMetadata.getHandlerNames();
for (StringMap<unsigned>::const_iterator
I = Kinds->begin(), E = Kinds->end(); I != E; ++I) {
Record.push_back(I->second);
StringRef KName = I->first();
SmallVector<std::pair<unsigned, StringRef>, 4> Names;
TheMetadata.getHandlerNames(Names);
for (SmallVector<std::pair<unsigned, StringRef>, 4>::iterator
I = Names.begin(),
E = Names.end(); I != E; ++I) {
Record.push_back(I->first);
StringRef KName = I->second;
for (unsigned i = 0, e = KName.size(); i != e; ++i)
Record.push_back(KName[i]);
if (!StartedMetadataBlock) {

13
lib/VMCore/AsmWriter.cpp
View File

@ -1295,7 +1295,7 @@ class AssemblyWriter {
TypePrinting TypePrinter;
AssemblyAnnotationWriter *AnnotationWriter;
std::vector<const Type*> NumberedTypes;
DenseMap<unsigned, const char *> MDNames;
DenseMap<unsigned, StringRef> MDNames;
public:
inline AssemblyWriter(formatted_raw_ostream &o, SlotTracker &Mac,
@ -1306,11 +1306,12 @@ public:
// FIXME: Provide MDPrinter
if (M) {
MetadataContext &TheMetadata = M->getContext().getMetadata();
const StringMap<unsigned> *Names = TheMetadata.getHandlerNames();
for (StringMapConstIterator<unsigned> I = Names->begin(),
E = Names->end(); I != E; ++I) {
const StringMapEntry<unsigned> &Entry = *I;
MDNames[I->second] = Entry.getKeyData();
SmallVector<std::pair<unsigned, StringRef>, 4> Names;
TheMetadata.getHandlerNames(Names);
for (SmallVector<std::pair<unsigned, StringRef>, 4>::iterator
I = Names.begin(),
E = Names.end(); I != E; ++I) {
MDNames[I->first] = I->second;
}
}
}

9
lib/VMCore/Metadata.cpp
View File

@ -305,9 +305,12 @@ MetadataContext::getMDs(const Instruction *Inst) {
}
/// getHandlerNames - Get handler names. This is used by bitcode
/// writer.
const StringMap<unsigned> *MetadataContext::getHandlerNames() {
return &MDHandlerNames;
/// writer and aswm writer.
void MetadataContext::
getHandlerNames(SmallVectorImpl<std::pair<unsigned, StringRef> >&Names) const {
for (StringMap<unsigned>::const_iterator I = MDHandlerNames.begin(),
E = MDHandlerNames.end(); I != E; ++I)
Names.push_back(std::make_pair(I->second, I->first()));
}
/// ValueIsCloned - This handler is used to update metadata store