Moved enum and command-line option in separate file. Also added function that returns...

[oota-llvm.git] / lib / Support / Annotation.cpp

diff --git a/lib/Support/Annotation.cpp b/lib/Support/Annotation.cpp
index d0d13cda86640659825a69da43d66f9dd7c40db0..9166240b824a043ccbb33f2ba8801b9fdb20e140 100644 (file)
--- a/lib/Support/Annotation.cpp
+++ b/lib/Support/Annotation.cpp
@@ -5,13 +5,9 @@
 //===----------------------------------------------------------------------===//
 
 #include <map>
-#include "llvm/Annotation.h"
-using std::string;
-using std::map;
-using std::pair;
-using std::make_pair;
+#include "Support/Annotation.h"
 
-typedef map<const string, unsigned> IDMapType;
+typedef std::map<const std::string, unsigned> IDMapType;
 static unsigned IDCounter = 0;  // Unique ID counter
 
 // Static member to ensure initialiation on demand.
@@ -19,11 +15,26 @@ 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; }
+typedef std::map<unsigned, std::pair<AnnFactory,void*> > FactMapType;
+
+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
+AnnotationID AnnotationManager::getID(const std::string &Name) {  // Name -> ID
   IDMapType::iterator I = getIDMap().find(Name);
   if (I == getIDMap().end()) {
     getIDMap()[Name] = IDCounter++;   // Add a new element
@@ -34,8 +45,8 @@ AnnotationID AnnotationManager::getID(const string &Name) {  // Name -> ID
 
 // getID - Name -> ID + registration of a factory function for demand driven
 // annotation support.
-AnnotationID AnnotationManager::getID(const string &Name, Factory Fact,
-                                     void *Data=0) {
+AnnotationID AnnotationManager::getID(const std::string &Name, Factory Fact,
+                                     void *Data) {
   AnnotationID Result(getID(Name));
   registerAnnotationFactory(Result, Fact, Data);
   return Result;                     
@@ -45,7 +56,7 @@ AnnotationID AnnotationManager::getID(const string &Name, Factory Fact,
 // getName - This function is especially slow, but that's okay because it should
 // only be used for debugging.
 //
-const string &AnnotationManager::getName(AnnotationID ID) {        // ID -> Name
+const std::string &AnnotationManager::getName(AnnotationID ID) {  // ID -> Name
   IDMapType &TheMap = getIDMap();
   for (IDMapType::iterator I = TheMap.begin(); ; ++I) {
     assert(I != TheMap.end() && "Annotation ID is unknown!");
@@ -62,9 +73,9 @@ void AnnotationManager::registerAnnotationFactory(AnnotationID ID,
                                                  AnnFactory F,
                                                  void *ExtraData) {
   if (F)
-    getFactMap()[ID.ID] = make_pair(F, ExtraData);
+    getFactMap()[ID.ID] = std::make_pair(F, ExtraData);
   else
-    getFactMap().erase(ID.ID);
+    eraseFromFactMap(ID.ID);
 }
 
 // createAnnotation - Create an annotation of the specified ID for the