[llvm-commits] CVS: llvm/lib/VMCore/Annotation.cpp

[Chris Lattner]

Changes in directory llvm/lib/VMCore:

Annotation.cpp updated: 1.6 -> 1.7

---
Log message:

Fix static initializer ordering dependency


---
Diffs of the changes:

Index: llvm/lib/VMCore/Annotation.cpp
diff -u llvm/lib/VMCore/Annotation.cpp:1.6 llvm/lib/VMCore/Annotation.cpp:1.7
--- llvm/lib/VMCore/Annotation.cpp:1.6	Wed Jul 24 15:17:22 2002
+++ llvm/lib/VMCore/Annotation.cpp	Sun Jan 12 18:52:43 2003
@@ -20,7 +20,22 @@
 // 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 @@
   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