[llvm-commits] CVS: llvm/lib/Analysis/IPA/Andersens.cpp CallGraph.cpp CallGraphSCCPass.cpp FindUsedTypes.cpp GlobalsModRef.cpp

[Devang Patel]

Changes in directory llvm/lib/Analysis/IPA:

Andersens.cpp updated: 1.47 -> 1.48
CallGraph.cpp updated: 1.67 -> 1.68
CallGraphSCCPass.cpp updated: 1.22 -> 1.23
FindUsedTypes.cpp updated: 1.39 -> 1.40
GlobalsModRef.cpp updated: 1.30 -> 1.31
---
Log message:

Use 'static const char' instead of 'static const int'.
Due to darwin gcc bug, one version of darwin linker coalesces 
static const int, which defauts PassID based pass identification.


---
Diffs of the changes:  (+10 -11)

 Andersens.cpp        |    4 ++--
 CallGraph.cpp        |    7 +++----
 CallGraphSCCPass.cpp |    4 ++--
 FindUsedTypes.cpp    |    2 +-
 GlobalsModRef.cpp    |    4 ++--
 5 files changed, 10 insertions(+), 11 deletions(-)


Index: llvm/lib/Analysis/IPA/Andersens.cpp
diff -u llvm/lib/Analysis/IPA/Andersens.cpp:1.47 llvm/lib/Analysis/IPA/Andersens.cpp:1.48
--- llvm/lib/Analysis/IPA/Andersens.cpp:1.47	Tue May  1 16:15:46 2007
+++ llvm/lib/Analysis/IPA/Andersens.cpp	Wed May  2 16:39:18 2007
@@ -76,7 +76,7 @@
   class VISIBILITY_HIDDEN Andersens : public ModulePass, public AliasAnalysis,
                                       private InstVisitor<Andersens> {
   public:
-    static const int ID; // Class identification, replacement for typeinfo
+    static const char ID; // Class identification, replacement for typeinfo
     Andersens() : ModulePass((intptr_t)&ID) {}
   private:
     /// Node class - This class is used to represent a memory object in the
@@ -339,7 +339,7 @@
     void visitInstruction(Instruction &I);
   };
 
-  const int Andersens::ID = 0;
+  const char Andersens::ID = 0;
   RegisterPass<Andersens> X("anders-aa",
                             "Andersen's Interprocedural Alias Analysis");
   RegisterAnalysisGroup<AliasAnalysis> Y(X);


Index: llvm/lib/Analysis/IPA/CallGraph.cpp
diff -u llvm/lib/Analysis/IPA/CallGraph.cpp:1.67 llvm/lib/Analysis/IPA/CallGraph.cpp:1.68
--- llvm/lib/Analysis/IPA/CallGraph.cpp:1.67	Wed May  2 15:37:47 2007
+++ llvm/lib/Analysis/IPA/CallGraph.cpp	Wed May  2 16:39:18 2007
@@ -51,7 +51,7 @@
   CallGraphNode *CallsExternalNode;
 
 public:
-  static const int ID; // Class identification, replacement for typeinfo
+  static const char ID; // Class identification, replacement for typeinfo
   BasicCallGraph() : ModulePass((intptr_t)&ID), Root(0), 
     ExternalCallingNode(0), CallsExternalNode(0) {}
 
@@ -190,15 +190,14 @@
   }
 };
 
-
 RegisterAnalysisGroup<CallGraph> X("Call Graph");
 RegisterPass<BasicCallGraph> Y("basiccg", "Basic CallGraph Construction");
 RegisterAnalysisGroup<CallGraph, true> Z(Y);
 
 } //End anonymous namespace
 
-const int CallGraph::ID = 0;
-const int BasicCallGraph::ID = 0;
+const char CallGraph::ID = 0;
+const char BasicCallGraph::ID = 0;
 
 void CallGraph::initialize(Module &M) {
   Mod = &M;


Index: llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp
diff -u llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp:1.22 llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp:1.23
--- llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp:1.22	Tue May  1 16:15:46 2007
+++ llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp	Wed May  2 16:39:18 2007
@@ -30,7 +30,7 @@
 class CGPassManager : public ModulePass, public PMDataManager {
 
 public:
-  static const int ID;
+  static const char ID;
   CGPassManager(int Depth) 
     : ModulePass((intptr_t)&ID), PMDataManager(Depth) { }
 
@@ -73,7 +73,7 @@
   }
 };
 
-const int CGPassManager::ID = 0;
+const char CGPassManager::ID = 0;
 /// run - Execute all of the passes scheduled for execution.  Keep track of
 /// whether any of the passes modifies the module, and if so, return true.
 bool CGPassManager::runOnModule(Module &M) {


Index: llvm/lib/Analysis/IPA/FindUsedTypes.cpp
diff -u llvm/lib/Analysis/IPA/FindUsedTypes.cpp:1.39 llvm/lib/Analysis/IPA/FindUsedTypes.cpp:1.40
--- llvm/lib/Analysis/IPA/FindUsedTypes.cpp:1.39	Tue May  1 16:15:46 2007
+++ llvm/lib/Analysis/IPA/FindUsedTypes.cpp	Wed May  2 16:39:18 2007
@@ -21,7 +21,7 @@
 #include "llvm/Support/InstIterator.h"
 using namespace llvm;
 
-const int FindUsedTypes::ID = 0;
+const char FindUsedTypes::ID = 0;
 static RegisterPass<FindUsedTypes>
 X("printusedtypes", "Find Used Types");
 


Index: llvm/lib/Analysis/IPA/GlobalsModRef.cpp
diff -u llvm/lib/Analysis/IPA/GlobalsModRef.cpp:1.30 llvm/lib/Analysis/IPA/GlobalsModRef.cpp:1.31
--- llvm/lib/Analysis/IPA/GlobalsModRef.cpp:1.30	Tue May  1 16:15:46 2007
+++ llvm/lib/Analysis/IPA/GlobalsModRef.cpp	Wed May  2 16:39:18 2007
@@ -83,7 +83,7 @@
     std::map<Function*, FunctionRecord> FunctionInfo;
 
   public:
-    static const int ID;
+    static const char ID;
     GlobalsModRef() : ModulePass((intptr_t)&ID) {}
 
     bool runOnModule(Module &M) {
@@ -146,7 +146,7 @@
     bool AnalyzeIndirectGlobalMemory(GlobalValue *GV);
   };
 
-  const int GlobalsModRef::ID = 0;
+  const char GlobalsModRef::ID = 0;
   RegisterPass<GlobalsModRef> X("globalsmodref-aa",
                                 "Simple mod/ref analysis for globals");
   RegisterAnalysisGroup<AliasAnalysis> Y(X);