Don't create a new node for every reference to a global. This caused a huge

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

diff --git a/lib/Support/Annotation.cpp b/lib/Support/Annotation.cpp
index 735d01b7824a2d3e8ca2c514707f3ae9d872a687..e876bf4f38b27ccdf5363897880b835f5218059a 100644 (file)
--- a/lib/Support/Annotation.cpp
+++ b/lib/Support/Annotation.cpp
@@ -6,6 +6,10 @@
 
 #include <map>
 #include "llvm/Annotation.h"
+using std::string;
+using std::map;
+using std::pair;
+using std::make_pair;
 
 typedef map<const string, unsigned> IDMapType;
 static unsigned IDCounter = 0;  // Unique ID counter
@@ -14,8 +18,8 @@ static unsigned IDCounter = 0;  // Unique ID counter
 static IDMapType &getIDMap() { static IDMapType TheMap; return TheMap; }
 
 // On demand annotation creation support...
-typedef Annotation *(*AnnFactory)(AnnotationID, Annotable *);
-typedef map<unsigned, AnnFactory> FactMapType;
+typedef Annotation *(*AnnFactory)(AnnotationID, const Annotable *, void *);
+typedef map<unsigned, pair<AnnFactory,void*> > FactMapType;
 static FactMapType &getFactMap() { static FactMapType FactMap; return FactMap; }
 
 
@@ -28,6 +32,16 @@ AnnotationID AnnotationManager::getID(const string &Name) {  // Name -> ID
   return I->second;
 }
 
+// getID - Name -> ID + registration of a factory function for demand driven
+// annotation support.
+AnnotationID AnnotationManager::getID(const string &Name, Factory Fact,
+                                     void *Data) {
+  AnnotationID Result(getID(Name));
+  registerAnnotationFactory(Result, Fact, Data);
+  return Result;                     
+}
+
+
 // getName - This function is especially slow, but that's okay because it should
 // only be used for debugging.
 //
@@ -45,9 +59,10 @@ const string &AnnotationManager::getName(AnnotationID ID) {        // ID -> Name
 // Annotable::findOrCreateAnnotation method.
 //
 void AnnotationManager::registerAnnotationFactory(AnnotationID ID, 
-                                                 AnnFactory F) {
+                                                 AnnFactory F,
+                                                 void *ExtraData) {
   if (F)
-    getFactMap()[ID.ID] = F;
+    getFactMap()[ID.ID] = make_pair(F, ExtraData);
   else
     getFactMap().erase(ID.ID);
 }
@@ -56,8 +71,8 @@ void AnnotationManager::registerAnnotationFactory(AnnotationID ID,
 // specified object, using a register annotation creation function.
 //
 Annotation *AnnotationManager::createAnnotation(AnnotationID ID, 
-                                               Annotable *Obj) {
+                                               const Annotable *Obj) {
   FactMapType::iterator I = getFactMap().find(ID.ID);
   if (I == getFactMap().end()) return 0;
-  return I->second(ID, Obj);
+  return I->second.first(ID, Obj, I->second.second);
 }