From: Chris Lattner Date: Wed, 4 Oct 2006 22:13:11 +0000 (+0000) Subject: Fix a static dtor issue X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c055a9191fbe31c4200a3868272103660669b0c7;p=oota-llvm.git Fix a static dtor issue git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@30726 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Support/Annotation.cpp b/lib/Support/Annotation.cpp index b46e218416c..cfc9c2ad962 100644 --- a/lib/Support/Annotation.cpp +++ b/lib/Support/Annotation.cpp @@ -12,6 +12,7 @@ //===----------------------------------------------------------------------===// #include "llvm/Support/Annotation.h" +#include "llvm/Support/ManagedStatic.h" #include using namespace llvm; @@ -30,7 +31,7 @@ typedef std::map IDMapType; static unsigned IDCounter = 0; // Unique ID counter // Static member to ensure initialiation on demand. -static IDMapType &getIDMap() { static IDMapType TheMap; return TheMap; } +static ManagedStatic IDMap; // On demand annotation creation support... typedef Annotation *(*AnnFactory)(AnnotationID, const Annotable *, void *); @@ -53,9 +54,9 @@ static void eraseFromFactMap(unsigned 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 + IDMapType::iterator I = IDMap->find(Name); + if (I == IDMap->end()) { + (*IDMap)[Name] = IDCounter++; // Add a new element return IDCounter-1; } return I->second; @@ -74,7 +75,7 @@ AnnotationID AnnotationManager::getID(const std::string &Name, Factory Fact, // only be used for debugging. // const std::string &AnnotationManager::getName(AnnotationID ID) { // ID -> Name - IDMapType &TheMap = getIDMap(); + IDMapType &TheMap = *IDMap; for (IDMapType::iterator I = TheMap.begin(); ; ++I) { assert(I != TheMap.end() && "Annotation ID is unknown!"); if (I->second == ID.ID) return I->first;