Build EC's for globals twice. The first is after constructing the initial

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

diff --git a/lib/Support/Annotation.cpp b/lib/Support/Annotation.cpp
index 9f24607af7c2e5ca54710847f08b8512d81aef81..d35904e9b894d8b1ab4c4940a3263d6123132158 100644 (file)
--- a/lib/Support/Annotation.cpp
+++ b/lib/Support/Annotation.cpp
@@ -1,17 +1,32 @@
-//===-- Annotation.cpp - Implement the Annotation Classes --------*- C++ -*--=//
+//===-- Annotation.cpp - Implement the Annotation Classes -----------------===//
+// 
+//                     The LLVM Compiler Infrastructure
+//
+// This file was developed by the LLVM research group and is distributed under
+// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// 
+//===----------------------------------------------------------------------===//
 //
 // This file implements the AnnotationManager class.
 //
 //===----------------------------------------------------------------------===//
 
+#include "llvm/Support/Annotation.h"
 #include <map>
-#include "Support/Annotation.h"
-using std::string;
-using std::map;
-using std::pair;
-using std::make_pair;
+using namespace llvm;
+
+Annotation::~Annotation() {}  // Designed to be subclassed
 
-typedef map<const string, unsigned> IDMapType;
+Annotable::~Annotable() {   // Virtual because it's designed to be subclassed...
+  Annotation *A = AnnotationList;
+  while (A) {
+    Annotation *Next = A->getNext();
+    delete A;
+    A = Next;
+  }
+}
+
+typedef std::map<const std::string, unsigned> IDMapType;
 static unsigned IDCounter = 0;  // Unique ID counter
 
 // Static member to ensure initialiation on demand.
@@ -19,7 +34,7 @@ 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;
+typedef std::map<unsigned, std::pair<AnnFactory,void*> > FactMapType;
 
 static FactMapType *TheFactMap = 0;
 static FactMapType &getFactMap() {
@@ -37,8 +52,7 @@ static void eraseFromFactMap(unsigned ID) {
   }
 }
 
-
-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
@@ -49,18 +63,17 @@ 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) {
+AnnotationID AnnotationManager::getID(const std::string &Name, Factory Fact,
+                                      void *Data) {
   AnnotationID Result(getID(Name));
   registerAnnotationFactory(Result, Fact, Data);
-  return Result;                     
+  return Result;                      
 }
 
-
 // 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!");
@@ -68,16 +81,14 @@ const string &AnnotationManager::getName(AnnotationID ID) {        // ID -> Name
   }
 }
 
-
 // registerAnnotationFactory - This method is used to register a callback
 // function used to create an annotation on demand if it is needed by the 
 // Annotable::findOrCreateAnnotation method.
 //
-void AnnotationManager::registerAnnotationFactory(AnnotationID ID, 
-                                                 AnnFactory F,
-                                                 void *ExtraData) {
+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
     eraseFromFactMap(ID.ID);
 }
@@ -86,7 +97,7 @@ void AnnotationManager::registerAnnotationFactory(AnnotationID ID,
 // specified object, using a register annotation creation function.
 //
 Annotation *AnnotationManager::createAnnotation(AnnotationID ID, 
-                                               const Annotable *Obj) {
+                                                const Annotable *Obj) {
   FactMapType::iterator I = getFactMap().find(ID.ID);
   if (I == getFactMap().end()) return 0;
   return I->second.first(ID, Obj, I->second.second);