[llvm-commits] [llvm] r116426 - /llvm/trunk/include/llvm/PassSupport.h

[Owen Anderson]

Author: resistor
Date: Wed Oct 13 15:24:34 2010
New Revision: 116426

URL: http://llvm.org/viewvc/llvm-project?rev=116426&view=rev
Log:
Take advantage of C++'s thread-safe static local initialization to simplify thread-safe pass initialization.

Modified:
    llvm/trunk/include/llvm/PassSupport.h

Modified: llvm/trunk/include/llvm/PassSupport.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/PassSupport.h?rev=116426&r1=116425&r2=116426&view=diff
==============================================================================
--- llvm/trunk/include/llvm/PassSupport.h (original)
+++ llvm/trunk/include/llvm/PassSupport.h Wed Oct 13 15:24:34 2010
@@ -24,6 +24,7 @@
 #include "Pass.h"
 #include "llvm/PassRegistry.h"
 #include "llvm/InitializePasses.h"
+#include "llvm/Support/Compiler.h"
 #include <vector>
 
 namespace llvm {
@@ -129,21 +130,20 @@
 };
 
 #define INITIALIZE_PASS(passName, arg, name, cfg, analysis) \
-  void llvm::initialize##passName##Pass(PassRegistry &Registry) { \
-    static bool initialized = false; \
-    if (initialized) return; \
-    initialized = true; \
+  static void* initialize##passName##PassOnce(PassRegistry &Registry) { \
     PassInfo *PI = new PassInfo(name, arg, & passName ::ID, \
       PassInfo::NormalCtor_t(callDefaultCtor< passName >), cfg, analysis); \
     Registry.registerPass(*PI); \
+    return PI; \
+  } \
+  void llvm::initialize##passName##Pass(PassRegistry &Registry) { \
+    ATTRIBUTE_USED \
+    static void* initialized = initialize##passName##PassOnce(Registry); \
   } \
   static RegisterPass<passName> passName ## _info(arg, name, cfg, analysis);
 
 #define INITIALIZE_PASS_BEGIN(passName, arg, name, cfg, analysis) \
-  void llvm::initialize##passName##Pass(PassRegistry &Registry) { \
-    static bool initialized = false; \
-    if (initialized) return; \
-    initialized = true;
+  static void* initialize##passName##PassOnce(PassRegistry &Registry) {
 
 #define INITIALIZE_PASS_DEPENDENCY(depName) \
     initialize##depName##Pass(Registry);
@@ -154,6 +154,11 @@
     PassInfo *PI = new PassInfo(name, arg, & passName ::ID, \
       PassInfo::NormalCtor_t(callDefaultCtor< passName >), cfg, analysis); \
     Registry.registerPass(*PI); \
+    return PI; \
+  } \
+  void llvm::initialize##passName##Pass(PassRegistry &Registry) { \
+    ATTRIBUTE_USED \
+    static void* initialized = initialize##passName##PassOnce(Registry); \
   } \
   static RegisterPass<passName> passName ## _info(arg, name, cfg, analysis);
 
@@ -232,14 +237,19 @@
 };
 
 #define INITIALIZE_ANALYSIS_GROUP(agName, name) \
-  void llvm::initialize##agName##AnalysisGroup(PassRegistry &Registry) { \
+  static void* initialize##agName##AnalysisGroupOnce(PassRegistry &Registry) { \
     PassInfo *AI = new PassInfo(name, & agName :: ID); \
     Registry.registerAnalysisGroup(& agName ::ID, 0, *AI, false); \
+    return AI; \
+  } \
+  void llvm::initialize##agName##AnalysisGroup(PassRegistry &Registry) { \
+    ATTRIBUTE_USED static void* initialized = \
+      initialize##agName##AnalysisGroupOnce(Registry); \
   } \
   static RegisterAnalysisGroup<agName> agName##_info (name);
 
 #define INITIALIZE_AG_PASS(passName, agName, arg, name, cfg, analysis, def) \
-  void llvm::initialize##passName##Pass(PassRegistry &Registry) { \
+  static void* initialize##passName##PassOnce(PassRegistry &Registry) { \
     initialize##agName##AnalysisGroup(Registry); \
     PassInfo *PI = new PassInfo(name, arg, & passName ::ID, \
       PassInfo::NormalCtor_t(callDefaultCtor< passName >), cfg, analysis); \
@@ -247,12 +257,17 @@
     \
     PassInfo *AI = new PassInfo(name, & agName :: ID); \
     Registry.registerAnalysisGroup(& agName ::ID, & passName ::ID, *AI, def); \
+    return AI; \
+  } \
+  void llvm::initialize##passName##Pass(PassRegistry &Registry) { \
+    ATTRIBUTE_USED \
+    static void* initialized = initialize##passName##PassOnce(Registry); \
   } \
   static RegisterPass<passName> passName ## _info(arg, name, cfg, analysis); \
   static RegisterAnalysisGroup<agName, def> passName ## _ag(passName ## _info);
 
 #define INITIALIZE_AG_PASS_BEGIN(passName, agName, arg, n, cfg, analysis, def) \
-  void llvm::initialize##passName##Pass(PassRegistry &Registry) { \
+  static void* initialize##passName##PassOnce(PassRegistry &Registry) { \
     initialize##agName##AnalysisGroup(Registry);
 
 #define INITIALIZE_AG_PASS_END(passName, agName, arg, n, cfg, analysis, def) \
@@ -262,6 +277,11 @@
     \
     PassInfo *AI = new PassInfo(n, & agName :: ID); \
     Registry.registerAnalysisGroup(& agName ::ID, & passName ::ID, *AI, def); \
+    return AI; \
+  } \
+  void llvm::initialize##passName##Pass(PassRegistry &Registry) { \
+    ATTRIBUTE_USED \
+    static void* initialized = initialize##passName##PassOnce(Registry); \
   } \
   static RegisterPass<passName> passName ## _info(arg, n, cfg, analysis); \
   static RegisterAnalysisGroup<agName, def> passName ## _ag(passName ## _info);