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 b88624dd1f0d059de2651e00fa37b19818bed19d..d35904e9b894d8b1ab4c4940a3263d6123132158 100644 (file)
--- a/lib/Support/Annotation.cpp
+++ b/lib/Support/Annotation.cpp
@@ -11,10 +11,20 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "llvm/Support/Annotation.h"
 #include <map>
-#include "Support/Annotation.h"
+using namespace llvm;
 
-namespace llvm {
+Annotation::~Annotation() {}  // Designed to be subclassed
+
+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
@@ -42,7 +52,6 @@ static void eraseFromFactMap(unsigned ID) {
   }
 }
 
-
 AnnotationID AnnotationManager::getID(const std::string &Name) {  // Name -> ID
   IDMapType::iterator I = getIDMap().find(Name);
   if (I == getIDMap().end()) {
@@ -55,13 +64,12 @@ AnnotationID AnnotationManager::getID(const std::string &Name) {  // Name -> ID
 // getID - Name -> ID + registration of a factory function for demand driven
 // annotation support.
 AnnotationID AnnotationManager::getID(const std::string &Name, Factory Fact,
-                                     void *Data) {
+                                      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.
 //
@@ -73,14 +81,12 @@ const std::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] = std::make_pair(F, ExtraData);
   else
@@ -91,10 +97,8 @@ 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);
 }
-
-} // End llvm namespace