6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-14 11:32:34 +00:00
Code Issues Projects Releases Wiki Activity

Fix static initializer ordering dependency

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@5236 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2003-01-13 00:52:43 +00:00
parent 3cf5db73c7
commit 3fa61eb199
2 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/Support/Annotation.cpp
View File

@ -20,7 +20,22 @@ static IDMapType &getIDMap() { static IDMapType TheMap; return TheMap; }
// On demand annotation creation support...
typedef Annotation *(*AnnFactory)(AnnotationID, const Annotable *, void *);
typedef map<unsigned, pair<AnnFactory,void*> > FactMapType;
static FactMapType &getFactMap() { static FactMapType FactMap; return FactMap; }
static FactMapType *TheFactMap = 0;
static FactMapType &getFactMap() {
if (TheFactMap == 0)
TheFactMap = new FactMapType();
return *TheFactMap;
}
static void eraseFromFactMap(unsigned ID) {
assert(TheFactMap && "No entries found!");
TheFactMap->erase(ID);
if (TheFactMap->empty()) { // Delete when empty
delete TheFactMap;
TheFactMap = 0;
}
}
AnnotationID AnnotationManager::getID(const string &Name) { // Name -> ID
@ -64,7 +79,7 @@ void AnnotationManager::registerAnnotationFactory(AnnotationID ID,
if (F)
getFactMap()[ID.ID] = make_pair(F, ExtraData);
else
getFactMap().erase(ID.ID);
eraseFromFactMap(ID.ID);
}
// createAnnotation - Create an annotation of the specified ID for the

19
support/lib/Support/Annotation.cpp
View File

@ -20,7 +20,22 @@ static IDMapType &getIDMap() { static IDMapType TheMap; return TheMap; }
// On demand annotation creation support...
typedef Annotation *(*AnnFactory)(AnnotationID, const Annotable *, void *);
typedef map<unsigned, pair<AnnFactory,void*> > FactMapType;
static FactMapType &getFactMap() { static FactMapType FactMap; return FactMap; }
static FactMapType *TheFactMap = 0;
static FactMapType &getFactMap() {
if (TheFactMap == 0)
TheFactMap = new FactMapType();
return *TheFactMap;
}
static void eraseFromFactMap(unsigned ID) {
assert(TheFactMap && "No entries found!");
TheFactMap->erase(ID);
if (TheFactMap->empty()) { // Delete when empty
delete TheFactMap;
TheFactMap = 0;
}
}
AnnotationID AnnotationManager::getID(const string &Name) { // Name -> ID
@ -64,7 +79,7 @@ void AnnotationManager::registerAnnotationFactory(AnnotationID ID,
if (F)
getFactMap()[ID.ID] = make_pair(F, ExtraData);
else
getFactMap().erase(ID.ID);
eraseFromFactMap(ID.ID);
}
// createAnnotation - Create an annotation of the specified ID for the