Hello:

+     static const int ID;
+     Hello() : FunctionPass((intptr_t)&ID) {}
+
     virtual bool runOnFunction(Function &F) {
       llvm::cerr << "Hello: " << F.getName() << "\n";
       return false;
@@ -277,6 +285,13 @@
 function.
 
 +  const int Hello::ID = 0;
+
+
+ We initialize pass ID here. LLVM uses ID's address to identify pass so 
+initialization value is not important.
+
+   RegisterPass<Hello> X("hello", "Hello World Pass");
 }  // end of anonymous namespace
 
@@ -295,6 +310,10 @@
 
 namespace {
   struct Hello : public FunctionPass {
+    
+    static const int ID;
+    Hello() : FunctionPass((intptr_t)&ID) {}
+
     virtual bool runOnFunction(Function &F) {
       llvm::cerr << "Hello: " << F.getName() << "\n";
       return false;
@@ -1788,7 +1807,7 @@
 
   Chris Lattner

   The LLVM Compiler Infrastructure

-  Last modified: $Date: 2007/04/17 00:17:11 $
+  Last modified: $Date: 2007/05/01 20:55:38 $
 
 
 





From christopher.lamb at gmail.com  Tue May  1 16:03:16 2007
From: christopher.lamb at gmail.com (Christopher Lamb)
Date: Tue, 1 May 2007 16:03:16 -0500
Subject: [llvm-commits] CVS: llvm/utils/TableGen/RegisterInfoEmitter.cpp
In-Reply-To: <74F07314-F0B2-469B-8BEE-4DF28A2D9677@mac.com>
References: <200705010557.l415vb52005240@zion.cs.uiuc.edu>
	
	<74F07314-F0B2-469B-8BEE-4DF28A2D9677@mac.com>
Message-ID: <8CF4D8A9-CCB4-416C-B1DD-5FC93FCDA890@gmail.com>


On May 1, 2007, at 3:28 PM, Nate Begeman wrote:

> On May 1, 2007, at 12:24 PM, Christopher Lamb wrote:
>
>> Hi Nate,
>>
>> Could you look into the possibility of re-using the sub/super
>> register support that Evan recently added? This may prevent much
>> duplication of information in the RegisterInfo.td, especially for
>> targets with vector registers that have many subregisters.
>
> It certainly would, I agree.
>
>> I believe that sub/super register generator unions the set of sub/
>> super registers in a deterministic fashion and produces the
>> necessary tables in the RegisterInfo.inc already. The only thing is
>> that this would make the sub register index implicit in the
>> ordering of the sub register list in the RegisterInfo.td.
>
> I'm not sure things are sufficiently well ordered internally for
> that, or sorted in any particular fashion.  I'll look into it, but it
> seems like it would be less flexible and make the td files far less
> intuitive as to what is actually going on.  If tablegen picked the
> numbering, I would have to go read the generated file to know what to
> write in the ISel for that backend, which seems backwards to me.

I see the problem in generating the ISel. Perhaps it would be be best  
to go the other way and have the sub/super reg sets be determined by  
the the explicit sets defined. My goal was simply to eliminate  
redundant, and possibly erroneously conflicting information from the  
file. Right now there are two different ways to specify sub  
registers, and if they don't match there could be problems.

>
>> Also, would it be possible to emit the information gathered as
>> table lookups rather than a massive two level switch statement? I
>> believe all the information to get the necessary mappings should be
>> available.
>
> It would be possible, but seems like significantly more work.  I'm
> sure it will be possible to improve upon the initial implementation,
> which should be good enough to address most of the issues blocked by
> the lack of subregs exposed to the selection dag.

Thanks for working on this. I didn't expect to get it addressed for  
quite a while!

--
Christopher Lamb



-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20070501/521fd814/attachment.html 

From natebegeman at mac.com  Tue May  1 16:10:34 2007
From: natebegeman at mac.com (Nate Begeman)
Date: Tue, 1 May 2007 14:10:34 -0700
Subject: [llvm-commits] CVS: llvm/utils/TableGen/RegisterInfoEmitter.cpp
In-Reply-To: <8CF4D8A9-CCB4-416C-B1DD-5FC93FCDA890@gmail.com>
References: <200705010557.l415vb52005240@zion.cs.uiuc.edu>
	
	<74F07314-F0B2-469B-8BEE-4DF28A2D9677@mac.com>
	<8CF4D8A9-CCB4-416C-B1DD-5FC93FCDA890@gmail.com>
Message-ID: 

On May 1, 2007, at 2:03 PM, Christopher Lamb wrote:

> I see the problem in generating the ISel. Perhaps it would be be  
> best to go the other way and have the sub/super reg sets be  
> determined by the the explicit sets defined. My goal was simply to  
> eliminate redundant, and possibly erroneously conflicting  
> information from the file. Right now there are two different ways  
> to specify sub registers, and if they don't match there could be  
> problems.
>
>>
>>> Also, would it be possible to emit the information gathered as
>>> table lookups rather than a massive two level switch statement? I
>>> believe all the information to get the necessary mappings should be
>>> available.
>>
>> It would be possible, but seems like significantly more work.  I'm
>> sure it will be possible to improve upon the initial implementation,
>> which should be good enough to address most of the issues blocked by
>> the lack of subregs exposed to the selection dag.
>
> Thanks for working on this. I didn't expect to get it addressed for  
> quite a while!

No prob.  I appreciate the feedback; I'll definitely be keeping it in  
mind while I finish the rest of the bug.  Hopefully for 2.1 we can  
have everything done with no duplication of subreg info.

Thanks,
Nate


From dpatel at apple.com  Tue May  1 16:17:37 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 1 May 2007 16:17:37 -0500
Subject: [llvm-commits] CVS: llvm/lib/Bytecode/Writer/Writer.cpp
Message-ID: <200705012117.l41LHbQ7031356@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Bytecode/Writer:

Writer.cpp updated: 1.179 -> 1.180
---
Log message:

Do not use typeinfo to identify pass in pass manager.


---
Diffs of the changes:  (+1 -0)

 Writer.cpp |    1 +
 1 files changed, 1 insertion(+)


Index: llvm/lib/Bytecode/Writer/Writer.cpp
diff -u llvm/lib/Bytecode/Writer/Writer.cpp:1.179 llvm/lib/Bytecode/Writer/Writer.cpp:1.180

--- llvm/lib/Bytecode/Writer/Writer.cpp:1.179	Sun Apr 29 13:35:00 2007
+++ llvm/lib/Bytecode/Writer/Writer.cpp	Tue May  1 16:15:46 2007
@@ -47,6 +47,7 @@
 /// @brief The bytecode version number
 const unsigned BCVersionNum = 7;
 
+const int WriteBytecodePass::ID = 0;
 static RegisterPass X("emitbytecode", "Bytecode Writer");
 
 STATISTIC(BytesWritten, "Number of bytecode bytes written");





From dpatel at apple.com  Tue May  1 16:17:41 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 1 May 2007 16:17:41 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/ARM/ARMConstantIslandPass.cpp
	ARMLoadStoreOptimizer.cpp
Message-ID: <200705012117.l41LHfn6031365@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/ARM:

ARMConstantIslandPass.cpp updated: 1.39 -> 1.40
ARMLoadStoreOptimizer.cpp updated: 1.8 -> 1.9
---
Log message:

Do not use typeinfo to identify pass in pass manager.


---
Diffs of the changes:  (+8 -0)

 ARMConstantIslandPass.cpp |    4 ++++
 ARMLoadStoreOptimizer.cpp |    4 ++++
 2 files changed, 8 insertions(+)


Index: llvm/lib/Target/ARM/ARMConstantIslandPass.cpp
diff -u llvm/lib/Target/ARM/ARMConstantIslandPass.cpp:1.39 llvm/lib/Target/ARM/ARMConstantIslandPass.cpp:1.40
--- llvm/lib/Target/ARM/ARMConstantIslandPass.cpp:1.39	Sun Apr 29 14:19:30 2007
+++ llvm/lib/Target/ARM/ARMConstantIslandPass.cpp	Tue May  1 16:15:46 2007
@@ -128,6 +128,9 @@
     ARMFunctionInfo *AFI;
     bool isThumb;
   public:
+    static const int ID;
+    ARMConstantIslands() : MachineFunctionPass((intptr_t)&ID) {}
+
     virtual bool runOnMachineFunction(MachineFunction &Fn);
 
     virtual const char *getPassName() const {
@@ -171,6 +174,7 @@
     void dumpBBs();
     void verify(MachineFunction &Fn);
   };
+  const int ARMConstantIslands::ID = 0;
 }
 
 /// verify - check BBOffsets, BBSizes, alignment of islands


Index: llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
diff -u llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp:1.8 llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp:1.9
--- llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp:1.8	Thu Apr 26 14:00:32 2007
+++ llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp	Tue May  1 16:15:46 2007
@@ -38,6 +38,9 @@
 
 namespace {
   struct VISIBILITY_HIDDEN ARMLoadStoreOpt : public MachineFunctionPass {
+    static const int ID;
+    ARMLoadStoreOpt() : MachineFunctionPass((intptr_t)&ID) {}
+
     const TargetInstrInfo *TII;
     const MRegisterInfo *MRI;
     ARMFunctionInfo *AFI;
@@ -70,6 +73,7 @@
     bool LoadStoreMultipleOpti(MachineBasicBlock &MBB);
     bool MergeReturnIntoLDM(MachineBasicBlock &MBB);
   };
+  const int ARMLoadStoreOpt::ID = 0;
 }
 
 /// createARMLoadStoreOptimizationPass - returns an instance of the load / store





From dpatel at apple.com  Tue May  1 16:17:44 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 1 May 2007 16:17:44 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/MSIL/MSILWriter.cpp MSILWriter.h
Message-ID: <200705012117.l41LHisK031374@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/MSIL:

MSILWriter.cpp updated: 1.4 -> 1.5
MSILWriter.h updated: 1.2 -> 1.3
---
Log message:

Do not use typeinfo to identify pass in pass manager.


---
Diffs of the changes:  (+6 -3)

 MSILWriter.cpp |    2 ++
 MSILWriter.h   |    7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)


Index: llvm/lib/Target/MSIL/MSILWriter.cpp
diff -u llvm/lib/Target/MSIL/MSILWriter.cpp:1.4 llvm/lib/Target/MSIL/MSILWriter.cpp:1.5
--- llvm/lib/Target/MSIL/MSILWriter.cpp:1.4	Mon Apr 16 13:10:23 2007
+++ llvm/lib/Target/MSIL/MSILWriter.cpp	Tue May  1 16:15:46 2007
@@ -80,6 +80,8 @@
   return Changed;
 }
 
+const int MSILModule::ID = 0;
+const int MSILWriter::ID = 0;
 
 bool MSILWriter::runOnFunction(Function &F) {
   if (F.isDeclaration()) return false;


Index: llvm/lib/Target/MSIL/MSILWriter.h
diff -u llvm/lib/Target/MSIL/MSILWriter.h:1.2 llvm/lib/Target/MSIL/MSILWriter.h:1.3
--- llvm/lib/Target/MSIL/MSILWriter.h:1.2	Mon Apr 16 13:10:23 2007
+++ llvm/lib/Target/MSIL/MSILWriter.h	Tue May  1 16:15:46 2007
@@ -37,9 +37,10 @@
     const TargetData*& TD;
 
   public:
+    static const int ID;
     MSILModule(const std::set*& _UsedTypes,
                const TargetData*& _TD)
-      : UsedTypes(_UsedTypes), TD(_TD) {}
+      : ModulePass((intptr_t)&ID), UsedTypes(_UsedTypes), TD(_TD) {}
 
     void getAnalysisUsage(AnalysisUsage &AU) const {
       AU.addRequired();
@@ -82,8 +83,8 @@
     std::map >
       StaticInitList;
     const std::set* UsedTypes;
-
-    MSILWriter(std::ostream &o) : Out(o) {
+    static const int ID;
+    MSILWriter(std::ostream &o) : FunctionPass((intptr_t)&ID), Out(o) {
       UniqID = 0;
     }
 





From dpatel at apple.com  Tue May  1 16:17:45 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 1 May 2007 16:17:45 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/Sparc/DelaySlotFiller.cpp
	FPMover.cpp
Message-ID: <200705012117.l41LHjFm031388@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/Sparc:

DelaySlotFiller.cpp updated: 1.13 -> 1.14
FPMover.cpp updated: 1.18 -> 1.19
---
Log message:

Do not use typeinfo to identify pass in pass manager.


---
Diffs of the changes:  (+9 -3)

 DelaySlotFiller.cpp |    5 ++++-
 FPMover.cpp         |    7 +++++--
 2 files changed, 9 insertions(+), 3 deletions(-)


Index: llvm/lib/Target/Sparc/DelaySlotFiller.cpp
diff -u llvm/lib/Target/Sparc/DelaySlotFiller.cpp:1.13 llvm/lib/Target/Sparc/DelaySlotFiller.cpp:1.14
--- llvm/lib/Target/Sparc/DelaySlotFiller.cpp:1.13	Tue Dec 19 16:59:26 2006
+++ llvm/lib/Target/Sparc/DelaySlotFiller.cpp	Tue May  1 16:15:46 2007
@@ -30,7 +30,9 @@
     TargetMachine &TM;
     const TargetInstrInfo *TII;
 
-    Filler(TargetMachine &tm) : TM(tm), TII(tm.getInstrInfo()) { }
+    static const int ID;
+    Filler(TargetMachine &tm) 
+      : MachineFunctionPass((intptr_t)&ID), TM(tm), TII(tm.getInstrInfo()) { }
 
     virtual const char *getPassName() const {
       return "SPARC Delay Slot Filler";
@@ -46,6 +48,7 @@
     }
 
   };
+  const int Filler::ID = 0;
 } // end of anonymous namespace
 
 /// createSparcDelaySlotFillerPass - Returns a pass that fills in delay


Index: llvm/lib/Target/Sparc/FPMover.cpp
diff -u llvm/lib/Target/Sparc/FPMover.cpp:1.18 llvm/lib/Target/Sparc/FPMover.cpp:1.19
--- llvm/lib/Target/Sparc/FPMover.cpp:1.18	Tue Dec 19 16:59:26 2006
+++ llvm/lib/Target/Sparc/FPMover.cpp	Tue May  1 16:15:46 2007
@@ -31,8 +31,10 @@
     /// layout, etc.
     ///
     TargetMachine &TM;
-
-    FPMover(TargetMachine &tm) : TM(tm) { }
+    
+    static const int ID;
+    FPMover(TargetMachine &tm) 
+      : MachineFunctionPass((intptr_t)&ID), TM(tm) { }
 
     virtual const char *getPassName() const {
       return "Sparc Double-FP Move Fixer";
@@ -41,6 +43,7 @@
     bool runOnMachineBasicBlock(MachineBasicBlock &MBB);
     bool runOnMachineFunction(MachineFunction &F);
   };
+  const int FPMover::ID = 0;
 } // end of anonymous namespace
 
 /// createSparcFPMoverPass - Returns a pass that turns FpMOVD





From dpatel at apple.com  Tue May  1 16:17:45 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 1 May 2007 16:17:45 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/TargetData.cpp
Message-ID: <200705012117.l41LHjxD031404@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target:

TargetData.cpp updated: 1.107 -> 1.108
---
Log message:

Do not use typeinfo to identify pass in pass manager.


---
Diffs of the changes:  (+3 -1)

 TargetData.cpp |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)


Index: llvm/lib/Target/TargetData.cpp
diff -u llvm/lib/Target/TargetData.cpp:1.107 llvm/lib/Target/TargetData.cpp:1.108
--- llvm/lib/Target/TargetData.cpp:1.107	Sun Apr 22 16:54:13 2007
+++ llvm/lib/Target/TargetData.cpp	Tue May  1 16:15:46 2007
@@ -33,6 +33,7 @@
 // Handle the Pass registration stuff necessary to use TargetData's.
 namespace {
   // Register the default SparcV9 implementation...
+  const int TargetData::ID = 0;
   RegisterPass X("targetdata", "Target Data Layout");
 }
 
@@ -221,7 +222,8 @@
   }
 }
 
-TargetData::TargetData(const Module *M) {
+TargetData::TargetData(const Module *M) 
+  : ImmutablePass((intptr_t)&ID) {
   init(M->getDataLayout());
 }
 





From dpatel at apple.com  Tue May  1 16:17:46 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 1 May 2007 16:17:46 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/PowerPC/PPCBranchSelector.cpp
	PPCCodeEmitter.cpp
Message-ID: <200705012117.l41LHkYc031427@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/PowerPC:

PPCBranchSelector.cpp updated: 1.42 -> 1.43
PPCCodeEmitter.cpp updated: 1.75 -> 1.76
---
Log message:

Do not use typeinfo to identify pass in pass manager.


---
Diffs of the changes:  (+7 -1)

 PPCBranchSelector.cpp |    4 ++++
 PPCCodeEmitter.cpp    |    4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)


Index: llvm/lib/Target/PowerPC/PPCBranchSelector.cpp
diff -u llvm/lib/Target/PowerPC/PPCBranchSelector.cpp:1.42 llvm/lib/Target/PowerPC/PPCBranchSelector.cpp:1.43
--- llvm/lib/Target/PowerPC/PPCBranchSelector.cpp:1.42	Fri Jan 26 08:34:51 2007
+++ llvm/lib/Target/PowerPC/PPCBranchSelector.cpp	Tue May  1 16:15:46 2007
@@ -32,6 +32,9 @@
 
 namespace {
   struct VISIBILITY_HIDDEN PPCBSel : public MachineFunctionPass {
+    static const int ID;
+    PPCBSel() : MachineFunctionPass((intptr_t)&ID) {}
+
     /// BlockSizes - The sizes of the basic blocks in the function.
     std::vector BlockSizes;
 
@@ -41,6 +44,7 @@
       return "PowerPC Branch Selector";
     }
   };
+  const int PPCBSel::ID = 0;
 }
 
 /// createPPCBranchSelectionPass - returns an instance of the Branch Selection


Index: llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp
diff -u llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp:1.75 llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp:1.76
--- llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp:1.75	Sat Feb 24 23:34:32 2007
+++ llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp	Tue May  1 16:15:46 2007
@@ -40,8 +40,9 @@
     int getMachineOpValue(MachineInstr &MI, MachineOperand &MO);
 
   public:
+    static const int ID;
     PPCCodeEmitter(TargetMachine &T, MachineCodeEmitter &M)
-      : TM(T), MCE(M) {}
+      : MachineFunctionPass((intptr_t)&ID), TM(T), MCE(M) {}
 
     const char *getPassName() const { return "PowerPC Machine Code Emitter"; }
 
@@ -63,6 +64,7 @@
     ///
     unsigned getBinaryCodeForInstr(MachineInstr &MI);
   };
+  const int PPCCodeEmitter::ID = 0;
 }
 
 /// createPPCCodeEmitterPass - Return a pass that emits the collected PPC code





From dpatel at apple.com  Tue May  1 16:17:46 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 1 May 2007 16:17:46 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Analysis/AliasAnalysis.h
	CallGraph.h Dominators.h FindUsedTypes.h IntervalPartition.h
	LoopInfo.h LoopPass.h PostDominators.h ProfileInfo.h
	ScalarEvolution.h ValueNumbering.h
Message-ID: <200705012117.l41LHkWb031450@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Analysis:

AliasAnalysis.h updated: 1.28 -> 1.29
CallGraph.h updated: 1.53 -> 1.54
Dominators.h updated: 1.76 -> 1.77
FindUsedTypes.h updated: 1.29 -> 1.30
IntervalPartition.h updated: 1.23 -> 1.24
LoopInfo.h updated: 1.63 -> 1.64
LoopPass.h updated: 1.15 -> 1.16
PostDominators.h updated: 1.17 -> 1.18
ProfileInfo.h updated: 1.5 -> 1.6
ScalarEvolution.h updated: 1.16 -> 1.17
ValueNumbering.h updated: 1.10 -> 1.11
---
Log message:

Do not use typeinfo to identify pass in pass manager.


---
Diffs of the changes:  (+45 -14)

 AliasAnalysis.h     |    1 +
 CallGraph.h         |    1 +
 Dominators.h        |   27 ++++++++++++++++++---------
 FindUsedTypes.h     |    3 +++
 IntervalPartition.h |    4 +++-
 LoopInfo.h          |    3 +++
 LoopPass.h          |    3 +++
 PostDominators.h    |   12 +++++++++---
 ProfileInfo.h       |    1 +
 ScalarEvolution.h   |    3 ++-
 ValueNumbering.h    |    1 +
 11 files changed, 45 insertions(+), 14 deletions(-)


Index: llvm/include/llvm/Analysis/AliasAnalysis.h
diff -u llvm/include/llvm/Analysis/AliasAnalysis.h:1.28 llvm/include/llvm/Analysis/AliasAnalysis.h:1.29
--- llvm/include/llvm/Analysis/AliasAnalysis.h:1.28	Sun Feb 11 22:59:57 2007
+++ llvm/include/llvm/Analysis/AliasAnalysis.h	Tue May  1 16:15:46 2007
@@ -61,6 +61,7 @@
   virtual void getAnalysisUsage(AnalysisUsage &AU) const;
 
 public:
+  static const int ID; // Class identification, replacement for typeinfo
   AliasAnalysis() : TD(0), AA(0) {}
   virtual ~AliasAnalysis();  // We want to be subclassed
 


Index: llvm/include/llvm/Analysis/CallGraph.h
diff -u llvm/include/llvm/Analysis/CallGraph.h:1.53 llvm/include/llvm/Analysis/CallGraph.h:1.54
--- llvm/include/llvm/Analysis/CallGraph.h:1.53	Sat Dec 16 23:15:12 2006
+++ llvm/include/llvm/Analysis/CallGraph.h	Tue May  1 16:15:46 2007
@@ -73,6 +73,7 @@
   FunctionMapTy FunctionMap;    // Map from a function to its node
 
 public:
+  static const int ID; // Class identification, replacement for typeinfo
   //===---------------------------------------------------------------------
   // Accessors...
   //


Index: llvm/include/llvm/Analysis/Dominators.h
diff -u llvm/include/llvm/Analysis/Dominators.h:1.76 llvm/include/llvm/Analysis/Dominators.h:1.77
--- llvm/include/llvm/Analysis/Dominators.h:1.76	Sat Apr 21 02:04:45 2007
+++ llvm/include/llvm/Analysis/Dominators.h	Tue May  1 16:15:46 2007
@@ -42,9 +42,10 @@
 protected:
   std::vector Roots;
   const bool IsPostDominators;
-
-  inline DominatorBase(bool isPostDom) : Roots(), IsPostDominators(isPostDom) {}
+  inline DominatorBase(intptr_t ID, bool isPostDom) : 
+    FunctionPass(ID), Roots(), IsPostDominators(isPostDom) {}
 public:
+
   /// getRoots -  Return the root blocks of the current CFG.  This may include
   /// multiple blocks if we are computing post dominators.  For forward
   /// dominators, this will always be a single block (the entry node).
@@ -135,7 +136,8 @@
   };
 
 public:
-  DominatorTreeBase(bool isPostDom) : DominatorBase(isPostDom) {}
+  DominatorTreeBase(intptr_t ID, bool isPostDom) 
+    : DominatorBase(ID, isPostDom) {}
   ~DominatorTreeBase() { reset(); }
 
   virtual void releaseMemory() { reset(); }
@@ -206,7 +208,8 @@
 ///
 class DominatorTree : public DominatorTreeBase {
 public:
-  DominatorTree() : DominatorTreeBase(false) {}
+  static const int ID; // Pass ID, replacement for typeid
+  DominatorTree() : DominatorTreeBase((intptr_t)&ID, false) {}
   
   BasicBlock *getRoot() const {
     assert(Roots.size() == 1 && "Should always have entry node!");
@@ -264,8 +267,9 @@
 ///
 class ETForestBase : public DominatorBase {
 public:
-  ETForestBase(bool isPostDom) : DominatorBase(isPostDom), Nodes(), 
-                                 DFSInfoValid(false), SlowQueries(0) {}
+  ETForestBase(intptr_t ID, bool isPostDom) 
+    : DominatorBase(ID, isPostDom), Nodes(), 
+      DFSInfoValid(false), SlowQueries(0) {}
   
   virtual void releaseMemory() { reset(); }
 
@@ -395,7 +399,9 @@
 
 class ETForest : public ETForestBase {
 public:
-  ETForest() : ETForestBase(false) {}
+  static const int ID; // Pass identifcation, replacement for typeid
+
+  ETForest() : ETForestBase((intptr_t)&ID, false) {}
 
   BasicBlock *getRoot() const {
     assert(Roots.size() == 1 && "Should always have entry node!");
@@ -425,7 +431,8 @@
 protected:
   DomSetMapType Frontiers;
 public:
-  DominanceFrontierBase(bool isPostDom) : DominatorBase(isPostDom) {}
+  DominanceFrontierBase(intptr_t ID, bool isPostDom) 
+    : DominatorBase(ID, isPostDom) {}
 
   virtual void releaseMemory() { Frontiers.clear(); }
 
@@ -470,7 +477,9 @@
 ///
 class DominanceFrontier : public DominanceFrontierBase {
 public:
-  DominanceFrontier() : DominanceFrontierBase(false) {}
+  static const int ID; // Pass ID, replacement for typeid
+  DominanceFrontier() : 
+    DominanceFrontierBase((intptr_t)& ID, false) {}
 
   BasicBlock *getRoot() const {
     assert(Roots.size() == 1 && "Should always have entry node!");


Index: llvm/include/llvm/Analysis/FindUsedTypes.h
diff -u llvm/include/llvm/Analysis/FindUsedTypes.h:1.29 llvm/include/llvm/Analysis/FindUsedTypes.h:1.30
--- llvm/include/llvm/Analysis/FindUsedTypes.h:1.29	Sat Dec 16 23:15:12 2006
+++ llvm/include/llvm/Analysis/FindUsedTypes.h	Tue May  1 16:15:46 2007
@@ -24,6 +24,9 @@
 class FindUsedTypes : public ModulePass {
   std::set UsedTypes;
 public:
+  static const int ID; // Pass identifcation, replacement for typeid
+  FindUsedTypes() : ModulePass((intptr_t)&ID) {}
+
   /// getTypes - After the pass has been run, return the set containing all of
   /// the types used in the module.
   ///


Index: llvm/include/llvm/Analysis/IntervalPartition.h
diff -u llvm/include/llvm/Analysis/IntervalPartition.h:1.23 llvm/include/llvm/Analysis/IntervalPartition.h:1.24
--- llvm/include/llvm/Analysis/IntervalPartition.h:1.23	Sat Dec 16 23:15:12 2006
+++ llvm/include/llvm/Analysis/IntervalPartition.h	Tue May  1 16:15:46 2007
@@ -45,7 +45,9 @@
   std::vector Intervals;
 
 public:
-  IntervalPartition() : RootInterval(0) {}
+  static const int ID; // Pass identifcation, replacement for typeid
+
+  IntervalPartition() : FunctionPass((intptr_t)&ID), RootInterval(0) {}
 
   // run - Calculate the interval partition for this function
   virtual bool runOnFunction(Function &F);


Index: llvm/include/llvm/Analysis/LoopInfo.h
diff -u llvm/include/llvm/Analysis/LoopInfo.h:1.63 llvm/include/llvm/Analysis/LoopInfo.h:1.64
--- llvm/include/llvm/Analysis/LoopInfo.h:1.63	Sat Dec 16 23:15:12 2006
+++ llvm/include/llvm/Analysis/LoopInfo.h	Tue May  1 16:15:46 2007
@@ -241,6 +241,9 @@
   std::vector TopLevelLoops;
   friend class Loop;
 public:
+  static const int ID; // Pass identifcation, replacement for typeid
+
+  LoopInfo() : FunctionPass((intptr_t)&ID) {}
   ~LoopInfo() { releaseMemory(); }
 
   /// iterator/begin/end - The interface to the top-level loops in the current


Index: llvm/include/llvm/Analysis/LoopPass.h
diff -u llvm/include/llvm/Analysis/LoopPass.h:1.15 llvm/include/llvm/Analysis/LoopPass.h:1.16
--- llvm/include/llvm/Analysis/LoopPass.h:1.15	Mon Apr 16 13:51:25 2007
+++ llvm/include/llvm/Analysis/LoopPass.h	Tue May  1 16:15:46 2007
@@ -29,6 +29,8 @@
 class LoopPass : public Pass {
 
  public:
+ LoopPass(intptr_t pid) : Pass(pid) {}
+
   // runOnLoop - THis method should be implemented by the subclass to perform
   // whatever action is necessary for the specfied Loop. 
   virtual bool runOnLoop (Loop *L, LPPassManager &LPM) = 0;
@@ -66,6 +68,7 @@
 class LPPassManager : public FunctionPass, public PMDataManager {
 
 public:
+  static const int ID;
   LPPassManager(int Depth);
 
   /// run - Execute all of the passes scheduled for execution.  Keep track of


Index: llvm/include/llvm/Analysis/PostDominators.h
diff -u llvm/include/llvm/Analysis/PostDominators.h:1.17 llvm/include/llvm/Analysis/PostDominators.h:1.18
--- llvm/include/llvm/Analysis/PostDominators.h:1.17	Sun Apr 15 18:14:18 2007
+++ llvm/include/llvm/Analysis/PostDominators.h	Tue May  1 16:15:46 2007
@@ -22,7 +22,10 @@
 /// compute the a post-dominator tree.
 ///
 struct PostDominatorTree : public DominatorTreeBase {
-  PostDominatorTree() : DominatorTreeBase(true) {}
+  static const int ID; // Pass identifcation, replacement for typeid
+
+  PostDominatorTree() : 
+    DominatorTreeBase((intptr_t)&ID, true) {}
 
   virtual bool runOnFunction(Function &F) {
     reset();     // Reset from the last time we were run...
@@ -51,7 +54,8 @@
 /// PostETForest Class - Concrete subclass of ETForestBase that is used to
 /// compute a forwards post-dominator ET-Forest.
 struct PostETForest : public ETForestBase {
-  PostETForest() : ETForestBase(true) {}
+  static const int ID;
+  PostETForest() : ETForestBase((intptr_t)&ID, true) {}
 
   virtual void getAnalysisUsage(AnalysisUsage &AU) const {
     AU.setPreservesAll();
@@ -75,7 +79,9 @@
 /// used to compute the a post-dominance frontier.
 ///
 struct PostDominanceFrontier : public DominanceFrontierBase {
-  PostDominanceFrontier() : DominanceFrontierBase(true) {}
+  static const int ID;
+  PostDominanceFrontier() 
+    : DominanceFrontierBase((intptr_t) &ID, true) {}
 
   virtual bool runOnFunction(Function &) {
     Frontiers.clear();


Index: llvm/include/llvm/Analysis/ProfileInfo.h
diff -u llvm/include/llvm/Analysis/ProfileInfo.h:1.5 llvm/include/llvm/Analysis/ProfileInfo.h:1.6
--- llvm/include/llvm/Analysis/ProfileInfo.h:1.5	Thu Apr 21 15:16:32 2005
+++ llvm/include/llvm/Analysis/ProfileInfo.h	Tue May  1 16:15:46 2007
@@ -38,6 +38,7 @@
     // entered.
     std::map, unsigned> EdgeCounts;
   public:
+    static const int ID; // Class identification, replacement for typeinfo
     virtual ~ProfileInfo();  // We want to be subclassed
 
     //===------------------------------------------------------------------===//


Index: llvm/include/llvm/Analysis/ScalarEvolution.h
diff -u llvm/include/llvm/Analysis/ScalarEvolution.h:1.16 llvm/include/llvm/Analysis/ScalarEvolution.h:1.17
--- llvm/include/llvm/Analysis/ScalarEvolution.h:1.16	Sun Mar  4 18:00:41 2007
+++ llvm/include/llvm/Analysis/ScalarEvolution.h	Tue May  1 16:15:46 2007
@@ -197,7 +197,8 @@
   class ScalarEvolution : public FunctionPass {
     void *Impl;    // ScalarEvolution uses the pimpl pattern
   public:
-    ScalarEvolution() : Impl(0) {}
+    static const int ID; // Pass identifcation, replacement for typeid
+    ScalarEvolution() : FunctionPass((intptr_t)&ID), Impl(0) {}
 
     /// getSCEV - Return a SCEV expression handle for the full generality of the
     /// specified expression.


Index: llvm/include/llvm/Analysis/ValueNumbering.h
diff -u llvm/include/llvm/Analysis/ValueNumbering.h:1.10 llvm/include/llvm/Analysis/ValueNumbering.h:1.11
--- llvm/include/llvm/Analysis/ValueNumbering.h:1.10	Wed Jun  7 17:00:25 2006
+++ llvm/include/llvm/Analysis/ValueNumbering.h	Tue May  1 16:15:46 2007
@@ -29,6 +29,7 @@
 class Instruction;
 
 struct ValueNumbering {
+  static const int ID; // Class identification, replacement for typeinfo
   virtual ~ValueNumbering();    // We want to be subclassed
 
   /// getEqualNumberNodes - Return nodes with the same value number as the





From dpatel at apple.com  Tue May  1 16:17:46 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 1 May 2007 16:17:46 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Instrumentation/BlockProfiling.cpp
	EdgeProfiling.cpp RSProfiling.cpp RSProfiling.h
Message-ID: <200705012117.l41LHkFL031476@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Instrumentation:

BlockProfiling.cpp updated: 1.22 -> 1.23
EdgeProfiling.cpp updated: 1.12 -> 1.13
RSProfiling.cpp updated: 1.23 -> 1.24
RSProfiling.h updated: 1.4 -> 1.5
---
Log message:

Do not use typeinfo to identify pass in pass manager.


---
Diffs of the changes:  (+19 -0)

 BlockProfiling.cpp |    7 +++++++
 EdgeProfiling.cpp  |    4 ++++
 RSProfiling.cpp    |    7 +++++++
 RSProfiling.h      |    1 +
 4 files changed, 19 insertions(+)


Index: llvm/lib/Transforms/Instrumentation/BlockProfiling.cpp
diff -u llvm/lib/Transforms/Instrumentation/BlockProfiling.cpp:1.22 llvm/lib/Transforms/Instrumentation/BlockProfiling.cpp:1.23
--- llvm/lib/Transforms/Instrumentation/BlockProfiling.cpp:1.22	Mon Feb  5 17:32:05 2007
+++ llvm/lib/Transforms/Instrumentation/BlockProfiling.cpp	Tue May  1 16:15:47 2007
@@ -32,9 +32,13 @@
 
 namespace {
   class VISIBILITY_HIDDEN FunctionProfiler : public RSProfilers_std {
+  public:
+    static const int ID;
     bool runOnModule(Module &M);
   };
 
+  const int FunctionProfiler::ID = 0;
+
   RegisterPass X("insert-function-profiling",
                                "Insert instrumentation for function profiling");
   RegisterAnalysisGroup XG(X);
@@ -79,8 +83,11 @@
 namespace {
   class BlockProfiler : public RSProfilers_std {
     bool runOnModule(Module &M);
+  public:
+    static const int ID;
   };
 
+  const int BlockProfiler::ID = 0;
   RegisterPass Y("insert-block-profiling",
                                 "Insert instrumentation for block profiling");
   RegisterAnalysisGroup YG(Y);


Index: llvm/lib/Transforms/Instrumentation/EdgeProfiling.cpp
diff -u llvm/lib/Transforms/Instrumentation/EdgeProfiling.cpp:1.12 llvm/lib/Transforms/Instrumentation/EdgeProfiling.cpp:1.13
--- llvm/lib/Transforms/Instrumentation/EdgeProfiling.cpp:1.12	Mon Feb  5 17:32:05 2007
+++ llvm/lib/Transforms/Instrumentation/EdgeProfiling.cpp	Tue May  1 16:15:47 2007
@@ -32,8 +32,12 @@
 namespace {
   class VISIBILITY_HIDDEN EdgeProfiler : public ModulePass {
     bool runOnModule(Module &M);
+  public:
+    static const int ID; // Pass identifcation, replacement for typeid
+    EdgeProfiler() : ModulePass((intptr_t)&ID) {}
   };
 
+  const int EdgeProfiler::ID = 0;
   RegisterPass X("insert-edge-profiling",
                                "Insert instrumentation for edge profiling");
 }


Index: llvm/lib/Transforms/Instrumentation/RSProfiling.cpp
diff -u llvm/lib/Transforms/Instrumentation/RSProfiling.cpp:1.23 llvm/lib/Transforms/Instrumentation/RSProfiling.cpp:1.24
--- llvm/lib/Transforms/Instrumentation/RSProfiling.cpp:1.23	Tue Apr 17 12:54:12 2007
+++ llvm/lib/Transforms/Instrumentation/RSProfiling.cpp	Tue May  1 16:15:47 2007
@@ -69,6 +69,7 @@
   /// measuring framework overhead
   class VISIBILITY_HIDDEN NullProfilerRS : public RSProfilers {
   public:
+    static const int ID; // Pass identifcation, replacement for typeid
     bool isProfiling(Value* v) {
       return false;
     }
@@ -80,7 +81,9 @@
     }
   };
 
+  const int RSProfilers::ID = 0;
   static RegisterAnalysisGroup A("Profiling passes");
+  const int NullProfilerRS::ID = 0;
   static RegisterPass NP("insert-null-profiling-rs",
                                          "Measure profiling framework overhead");
   static RegisterAnalysisGroup NPT(NP);
@@ -138,6 +141,9 @@
 
   /// ProfilerRS - Insert the random sampling framework
   struct VISIBILITY_HIDDEN ProfilerRS : public FunctionPass {
+    static const int ID; // Pass identifcation, replacement for typeid
+    ProfilerRS() : FunctionPass((intptr_t)&ID) {}
+
     std::map TransCache;
     std::set ChoicePoints;
     Chooser* c;
@@ -154,6 +160,7 @@
     virtual void getAnalysisUsage(AnalysisUsage &AU) const;
   };
 
+  const int ProfilerRS::ID = 0;
   RegisterPass X("insert-rs-profiling-framework",
                              "Insert random sampling instrumentation framework");
 }


Index: llvm/lib/Transforms/Instrumentation/RSProfiling.h
diff -u llvm/lib/Transforms/Instrumentation/RSProfiling.h:1.4 llvm/lib/Transforms/Instrumentation/RSProfiling.h:1.5
--- llvm/lib/Transforms/Instrumentation/RSProfiling.h:1.4	Sat Feb  3 18:40:41 2007
+++ llvm/lib/Transforms/Instrumentation/RSProfiling.h	Tue May  1 16:15:47 2007
@@ -17,6 +17,7 @@
   /// RSProfilers_std - a simple support class for profilers that handles most
   /// of the work of chaining and tracking inserted code.
   struct RSProfilers_std : public RSProfilers {
+    static const int ID;
     std::set profcode;
     // Lookup up values in profcode
     virtual bool isProfiling(Value* v);





From dpatel at apple.com  Tue May  1 16:17:47 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 1 May 2007 16:17:47 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/Alpha/AlphaBranchSelector.cpp
	AlphaCodeEmitter.cpp AlphaLLRP.cpp
Message-ID: <200705012117.l41LHljN031509@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/Alpha:

AlphaBranchSelector.cpp updated: 1.2 -> 1.3
AlphaCodeEmitter.cpp updated: 1.21 -> 1.22
AlphaLLRP.cpp updated: 1.8 -> 1.9
---
Log message:

Do not use typeinfo to identify pass in pass manager.


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

 AlphaBranchSelector.cpp |    3 +++
 AlphaCodeEmitter.cpp    |    6 ++++--
 AlphaLLRP.cpp           |    5 ++++-
 3 files changed, 11 insertions(+), 3 deletions(-)


Index: llvm/lib/Target/Alpha/AlphaBranchSelector.cpp
diff -u llvm/lib/Target/Alpha/AlphaBranchSelector.cpp:1.2 llvm/lib/Target/Alpha/AlphaBranchSelector.cpp:1.3
--- llvm/lib/Target/Alpha/AlphaBranchSelector.cpp:1.2	Thu Nov 30 01:12:03 2006
+++ llvm/lib/Target/Alpha/AlphaBranchSelector.cpp	Tue May  1 16:15:46 2007
@@ -22,6 +22,8 @@
 
 namespace {
   struct VISIBILITY_HIDDEN AlphaBSel : public MachineFunctionPass {
+    static const int ID;
+    AlphaBSel() : MachineFunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnMachineFunction(MachineFunction &Fn);
 
@@ -29,6 +31,7 @@
       return "Alpha Branch Selection";
     }
   };
+  const int AlphaBSel::ID = 0;
 }
 
 /// createAlphaBranchSelectionPass - returns an instance of the Branch Selection


Index: llvm/lib/Target/Alpha/AlphaCodeEmitter.cpp
diff -u llvm/lib/Target/Alpha/AlphaCodeEmitter.cpp:1.21 llvm/lib/Target/Alpha/AlphaCodeEmitter.cpp:1.22
--- llvm/lib/Target/Alpha/AlphaCodeEmitter.cpp:1.21	Tue Dec 19 16:59:25 2006
+++ llvm/lib/Target/Alpha/AlphaCodeEmitter.cpp	Tue May  1 16:15:46 2007
@@ -36,11 +36,12 @@
     int getMachineOpValue(MachineInstr &MI, MachineOperand &MO);
 
   public:
+    static const int ID;
     explicit AlphaCodeEmitter(TargetMachine &tm, MachineCodeEmitter &mce)
-      : II(0), TM(tm), MCE(mce) {}
+      : MachineFunctionPass((intptr_t)&ID), II(0), TM(tm), MCE(mce) {}
     AlphaCodeEmitter(TargetMachine &tm, MachineCodeEmitter &mce,
                      const AlphaInstrInfo& ii)
-      : II(&ii), TM(tm), MCE(mce) {}
+      : MachineFunctionPass((intptr_t)&ID), II(&ii), TM(tm), MCE(mce) {}
 
     bool runOnMachineFunction(MachineFunction &MF);
 
@@ -60,6 +61,7 @@
     void emitBasicBlock(MachineBasicBlock &MBB);
 
   };
+  const int AlphaCodeEmitter::ID = 0;
 }
 
 /// createAlphaCodeEmitterPass - Return a pass that emits the collected Alpha code


Index: llvm/lib/Target/Alpha/AlphaLLRP.cpp
diff -u llvm/lib/Target/Alpha/AlphaLLRP.cpp:1.8 llvm/lib/Target/Alpha/AlphaLLRP.cpp:1.9
--- llvm/lib/Target/Alpha/AlphaLLRP.cpp:1.8	Mon Apr 16 13:10:22 2007
+++ llvm/lib/Target/Alpha/AlphaLLRP.cpp	Tue May  1 16:15:46 2007
@@ -37,7 +37,9 @@
     ///
     AlphaTargetMachine &TM;
 
-    AlphaLLRPPass(AlphaTargetMachine &tm) : TM(tm) { }
+    static const int ID;
+    AlphaLLRPPass(AlphaTargetMachine &tm) 
+      : MachineFunctionPass((intptr_t)&ID), TM(tm) { }
 
     virtual const char *getPassName() const {
       return "Alpha NOP inserter";
@@ -152,6 +154,7 @@
       return Changed;
     }
   };
+  const int AlphaLLRPPass::ID = 0;
 } // end of anonymous namespace
 
 FunctionPass *llvm::createAlphaLLRPPass(AlphaTargetMachine &tm) {





From dpatel at apple.com  Tue May  1 16:17:46 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 1 May 2007 16:17:46 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp LCSSA.cpp
	LoopSimplify.cpp LowerAllocations.cpp LowerInvoke.cpp
	LowerSelect.cpp LowerSwitch.cpp Mem2Reg.cpp
	UnifyFunctionExitNodes.cpp
Message-ID: <200705012117.l41LHkZM031466@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Utils:

BreakCriticalEdges.cpp updated: 1.44 -> 1.45
LCSSA.cpp updated: 1.38 -> 1.39
LoopSimplify.cpp updated: 1.92 -> 1.93
LowerAllocations.cpp updated: 1.73 -> 1.74
LowerInvoke.cpp updated: 1.59 -> 1.60
LowerSelect.cpp updated: 1.12 -> 1.13
LowerSwitch.cpp updated: 1.38 -> 1.39
Mem2Reg.cpp updated: 1.26 -> 1.27
UnifyFunctionExitNodes.cpp updated: 1.36 -> 1.37
---
Log message:

Do not use typeinfo to identify pass in pass manager.


---
Diffs of the changes:  (+33 -3)

 BreakCriticalEdges.cpp     |    4 ++++
 LCSSA.cpp                  |    4 ++++
 LoopSimplify.cpp           |    4 ++++
 LowerAllocations.cpp       |    5 ++++-
 LowerInvoke.cpp            |    5 ++++-
 LowerSelect.cpp            |    5 ++++-
 LowerSwitch.cpp            |    4 ++++
 Mem2Reg.cpp                |    4 ++++
 UnifyFunctionExitNodes.cpp |    1 +
 9 files changed, 33 insertions(+), 3 deletions(-)


Index: llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp
diff -u llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp:1.44 llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp:1.45
--- llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp:1.44	Tue Apr 17 13:09:47 2007
+++ llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp	Tue May  1 16:15:47 2007
@@ -34,6 +34,9 @@
 
 namespace {
   struct VISIBILITY_HIDDEN BreakCriticalEdges : public FunctionPass {
+    static const int ID; // Pass identifcation, replacement for typeid
+    BreakCriticalEdges() : FunctionPass((intptr_t)&ID) {}
+
     virtual bool runOnFunction(Function &F);
 
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
@@ -47,6 +50,7 @@
     }
   };
 
+  const int BreakCriticalEdges::ID = 0;
   RegisterPass X("break-crit-edges",
                                     "Break critical edges in CFG");
 }


Index: llvm/lib/Transforms/Utils/LCSSA.cpp
diff -u llvm/lib/Transforms/Utils/LCSSA.cpp:1.38 llvm/lib/Transforms/Utils/LCSSA.cpp:1.39
--- llvm/lib/Transforms/Utils/LCSSA.cpp:1.38	Wed Apr 18 17:39:00 2007
+++ llvm/lib/Transforms/Utils/LCSSA.cpp	Tue May  1 16:15:47 2007
@@ -47,6 +47,9 @@
 
 namespace {
   struct VISIBILITY_HIDDEN LCSSA : public FunctionPass {
+    static const int ID; // Pass identifcation, replacement for typeid
+    LCSSA() : FunctionPass((intptr_t)&ID) {}
+
     // Cached analysis information for the current function.
     LoopInfo *LI;
     DominatorTree *DT;
@@ -81,6 +84,7 @@
     }
   };
   
+  const int LCSSA::ID = 0;
   RegisterPass X("lcssa", "Loop-Closed SSA Form Pass");
 }
 


Index: llvm/lib/Transforms/Utils/LoopSimplify.cpp
diff -u llvm/lib/Transforms/Utils/LoopSimplify.cpp:1.92 llvm/lib/Transforms/Utils/LoopSimplify.cpp:1.93
--- llvm/lib/Transforms/Utils/LoopSimplify.cpp:1.92	Fri Apr 20 15:04:37 2007
+++ llvm/lib/Transforms/Utils/LoopSimplify.cpp	Tue May  1 16:15:47 2007
@@ -54,6 +54,9 @@
 
 namespace {
   struct VISIBILITY_HIDDEN LoopSimplify : public FunctionPass {
+    static const int ID; // Pass identifcation, replacement for typeid
+    LoopSimplify() : FunctionPass((intptr_t)&ID) {}
+
     // AA - If we have an alias analysis object to update, this is it, otherwise
     // this is null.
     AliasAnalysis *AA;
@@ -89,6 +92,7 @@
                                          std::vector &PredBlocks);
   };
 
+  const int LoopSimplify::ID = 0;
   RegisterPass
   X("loopsimplify", "Canonicalize natural loops", true);
 }


Index: llvm/lib/Transforms/Utils/LowerAllocations.cpp
diff -u llvm/lib/Transforms/Utils/LowerAllocations.cpp:1.73 llvm/lib/Transforms/Utils/LowerAllocations.cpp:1.74
--- llvm/lib/Transforms/Utils/LowerAllocations.cpp:1.73	Mon Apr 16 13:10:23 2007
+++ llvm/lib/Transforms/Utils/LowerAllocations.cpp	Tue May  1 16:15:47 2007
@@ -36,8 +36,10 @@
     Constant *FreeFunc;     // Initialized by doInitialization
     bool LowerMallocArgToInteger;
   public:
+    static const int ID; // Pass ID, replacement for typeid
     LowerAllocations(bool LowerToInt = false)
-      : MallocFunc(0), FreeFunc(0), LowerMallocArgToInteger(LowerToInt) {}
+      : BasicBlockPass((intptr_t)&ID), MallocFunc(0), FreeFunc(0), 
+        LowerMallocArgToInteger(LowerToInt) {}
 
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
       AU.addRequired();
@@ -66,6 +68,7 @@
     bool runOnBasicBlock(BasicBlock &BB);
   };
 
+  const int LowerAllocations::ID = 0;
   RegisterPass
   X("lowerallocs", "Lower allocations from instructions to calls");
 }


Index: llvm/lib/Transforms/Utils/LowerInvoke.cpp
diff -u llvm/lib/Transforms/Utils/LowerInvoke.cpp:1.59 llvm/lib/Transforms/Utils/LowerInvoke.cpp:1.60
--- llvm/lib/Transforms/Utils/LowerInvoke.cpp:1.59	Fri Apr 20 17:40:10 2007
+++ llvm/lib/Transforms/Utils/LowerInvoke.cpp	Tue May  1 16:15:47 2007
@@ -75,7 +75,9 @@
     const TargetLowering *TLI;
     
   public:
-    LowerInvoke(const TargetLowering *tli = NULL) : TLI(tli) { }
+    static const int ID; // Pass identifcation, replacement for typeid
+    LowerInvoke(const TargetLowering *tli = NULL) : FunctionPass((intptr_t)&ID),
+      TLI(tli) { }
     bool doInitialization(Module &M);
     bool runOnFunction(Function &F);
  
@@ -97,6 +99,7 @@
     bool insertExpensiveEHSupport(Function &F);
   };
 
+  const int LowerInvoke::ID = 0;
   RegisterPass
   X("lowerinvoke", "Lower invoke and unwind, for unwindless code generators");
 }


Index: llvm/lib/Transforms/Utils/LowerSelect.cpp
diff -u llvm/lib/Transforms/Utils/LowerSelect.cpp:1.12 llvm/lib/Transforms/Utils/LowerSelect.cpp:1.13
--- llvm/lib/Transforms/Utils/LowerSelect.cpp:1.12	Mon Apr 16 13:10:23 2007
+++ llvm/lib/Transforms/Utils/LowerSelect.cpp	Tue May  1 16:15:47 2007
@@ -33,7 +33,9 @@
   class VISIBILITY_HIDDEN LowerSelect : public FunctionPass {
     bool OnlyFP;   // Only lower FP select instructions?
   public:
-    LowerSelect(bool onlyfp = false) : OnlyFP(onlyfp) {}
+    static const int ID; // Pass identifcation, replacement for typeid
+    LowerSelect(bool onlyfp = false) : FunctionPass((intptr_t)&ID), 
+      OnlyFP(onlyfp) {}
 
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
       // This certainly destroys the CFG.
@@ -48,6 +50,7 @@
     bool runOnFunction(Function &F);
   };
 
+  const int LowerSelect::ID = 0;
   RegisterPass
   X("lowerselect", "Lower select instructions to branches");
 }


Index: llvm/lib/Transforms/Utils/LowerSwitch.cpp
diff -u llvm/lib/Transforms/Utils/LowerSwitch.cpp:1.38 llvm/lib/Transforms/Utils/LowerSwitch.cpp:1.39
--- llvm/lib/Transforms/Utils/LowerSwitch.cpp:1.38	Tue Apr 17 13:09:47 2007
+++ llvm/lib/Transforms/Utils/LowerSwitch.cpp	Tue May  1 16:15:47 2007
@@ -30,6 +30,9 @@
   /// modifies the CFG!
   class VISIBILITY_HIDDEN LowerSwitch : public FunctionPass {
   public:
+    static const int ID; // Pass identifcation, replacement for typeid
+    LowerSwitch() : FunctionPass((intptr_t) &ID) {} 
+
     virtual bool runOnFunction(Function &F);
     
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
@@ -75,6 +78,7 @@
     }
   };
 
+  const int LowerSwitch::ID = 0;
   RegisterPass
   X("lowerswitch", "Lower SwitchInst's to branches");
 }


Index: llvm/lib/Transforms/Utils/Mem2Reg.cpp
diff -u llvm/lib/Transforms/Utils/Mem2Reg.cpp:1.26 llvm/lib/Transforms/Utils/Mem2Reg.cpp:1.27
--- llvm/lib/Transforms/Utils/Mem2Reg.cpp:1.26	Wed Apr 25 13:32:35 2007
+++ llvm/lib/Transforms/Utils/Mem2Reg.cpp	Tue May  1 16:15:47 2007
@@ -27,6 +27,9 @@
 
 namespace {
   struct VISIBILITY_HIDDEN PromotePass : public FunctionPass {
+    static const int ID; // Pass identifcation, replacement for typeid
+    PromotePass() : FunctionPass((intptr_t)&ID) {}
+
     // runOnFunction - To run this pass, first we calculate the alloca
     // instructions that are safe for promotion, then we promote each one.
     //
@@ -47,6 +50,7 @@
     }
   };
 
+  const int PromotePass::ID = 0;
   RegisterPass X("mem2reg", "Promote Memory to Register");
 }  // end of anonymous namespace
 


Index: llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp
diff -u llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp:1.36 llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp:1.37
--- llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp:1.36	Sun Aug 27 17:42:52 2006
+++ llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp	Tue May  1 16:15:47 2007
@@ -22,6 +22,7 @@
 #include "llvm/Type.h"
 using namespace llvm;
 
+const int UnifyFunctionExitNodes::ID = 0;
 static RegisterPass
 X("mergereturn", "Unify function exit nodes");
 





From dpatel at apple.com  Tue May  1 16:17:47 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 1 May 2007 16:17:47 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
Message-ID: <200705012117.l41LHlq8031517@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen/SelectionDAG:

SelectionDAGISel.cpp updated: 1.442 -> 1.443
---
Log message:

Do not use typeinfo to identify pass in pass manager.


---
Diffs of the changes:  (+2 -0)

 SelectionDAGISel.cpp |    2 ++
 1 files changed, 2 insertions(+)


Index: llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.442 llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.443
--- llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.442	Mon Apr 30 16:11:17 2007
+++ llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp	Tue May  1 16:15:46 2007
@@ -5011,3 +5011,5 @@
   if (e != InOps.size())
     Ops.push_back(InOps.back());
 }
+
+const int SelectionDAGISel::ID = 0;





From dpatel at apple.com  Tue May  1 16:17:47 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 1 May 2007 16:17:47 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/IPO/ArgumentPromotion.cpp
	ConstantMerge.cpp DeadArgumentElimination.cpp
	DeadTypeElimination.cpp ExtractFunction.cpp GlobalDCE.cpp
	GlobalOpt.cpp IPConstantPropagation.cpp IndMemRemoval.cpp
	InlineSimple.cpp Inliner.cpp Inliner.h Internalize.cpp
	LoopExtractor.cpp LowerSetJmp.cpp PruneEH.cpp
	RaiseAllocations.cpp SimplifyLibCalls.cpp
	StripDeadPrototypes.cpp StripSymbols.cpp
Message-ID: <200705012117.l41LHljv031510@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/IPO:

ArgumentPromotion.cpp updated: 1.39 -> 1.40
ConstantMerge.cpp updated: 1.39 -> 1.40
DeadArgumentElimination.cpp updated: 1.40 -> 1.41
DeadTypeElimination.cpp updated: 1.62 -> 1.63
ExtractFunction.cpp updated: 1.20 -> 1.21
GlobalDCE.cpp updated: 1.45 -> 1.46
GlobalOpt.cpp updated: 1.101 -> 1.102
IPConstantPropagation.cpp updated: 1.23 -> 1.24
IndMemRemoval.cpp updated: 1.15 -> 1.16
InlineSimple.cpp updated: 1.78 -> 1.79
Inliner.cpp updated: 1.37 -> 1.38
Inliner.h updated: 1.9 -> 1.10
Internalize.cpp updated: 1.45 -> 1.46
LoopExtractor.cpp updated: 1.24 -> 1.25
LowerSetJmp.cpp updated: 1.40 -> 1.41
PruneEH.cpp updated: 1.31 -> 1.32
RaiseAllocations.cpp updated: 1.40 -> 1.41
SimplifyLibCalls.cpp updated: 1.112 -> 1.113
StripDeadPrototypes.cpp updated: 1.5 -> 1.6
StripSymbols.cpp updated: 1.15 -> 1.16
---
Log message:

Do not use typeinfo to identify pass in pass manager.


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

 ArgumentPromotion.cpp       |    4 ++++
 ConstantMerge.cpp           |    4 ++++
 DeadArgumentElimination.cpp |    5 +++++
 DeadTypeElimination.cpp     |    4 ++++
 ExtractFunction.cpp         |    6 +++++-
 GlobalDCE.cpp               |    4 ++++
 GlobalOpt.cpp               |    3 +++
 IPConstantPropagation.cpp   |    4 ++++
 IndMemRemoval.cpp           |    4 ++++
 InlineSimple.cpp            |    2 ++
 Inliner.cpp                 |    4 +++-
 Inliner.h                   |    1 +
 Internalize.cpp             |    6 ++++--
 LoopExtractor.cpp           |   15 ++++++++++++---
 LowerSetJmp.cpp             |    4 ++++
 PruneEH.cpp                 |    5 +++++
 RaiseAllocations.cpp        |    5 ++++-
 SimplifyLibCalls.cpp        |    4 ++++
 StripDeadPrototypes.cpp     |    5 ++++-
 StripSymbols.cpp            |    6 +++++-
 20 files changed, 85 insertions(+), 10 deletions(-)


Index: llvm/lib/Transforms/IPO/ArgumentPromotion.cpp
diff -u llvm/lib/Transforms/IPO/ArgumentPromotion.cpp:1.39 llvm/lib/Transforms/IPO/ArgumentPromotion.cpp:1.40
--- llvm/lib/Transforms/IPO/ArgumentPromotion.cpp:1.39	Thu Mar  1 15:00:32 2007
+++ llvm/lib/Transforms/IPO/ArgumentPromotion.cpp	Tue May  1 16:15:46 2007
@@ -63,12 +63,16 @@
     }
 
     virtual bool runOnSCC(const std::vector &SCC);
+    static const int ID; // Pass identifcation, replacement for typeid
+    ArgPromotion() : CallGraphSCCPass((intptr_t)&ID) {}
+
   private:
     bool PromoteArguments(CallGraphNode *CGN);
     bool isSafeToPromoteArgument(Argument *Arg) const;
     Function *DoPromotion(Function *F, std::vector &ArgsToPromote);
   };
 
+  const int ArgPromotion::ID = 0;
   RegisterPass X("argpromotion",
                                "Promote 'by reference' arguments to scalars");
 }


Index: llvm/lib/Transforms/IPO/ConstantMerge.cpp
diff -u llvm/lib/Transforms/IPO/ConstantMerge.cpp:1.39 llvm/lib/Transforms/IPO/ConstantMerge.cpp:1.40
--- llvm/lib/Transforms/IPO/ConstantMerge.cpp:1.39	Sat Apr 14 13:06:52 2007
+++ llvm/lib/Transforms/IPO/ConstantMerge.cpp	Tue May  1 16:15:46 2007
@@ -29,12 +29,16 @@
 
 namespace {
   struct VISIBILITY_HIDDEN ConstantMerge : public ModulePass {
+    static const int ID; // Pass identifcation, replacement for typeid
+    ConstantMerge() : ModulePass((intptr_t)&ID) {}
+
     // run - For this pass, process all of the globals in the module,
     // eliminating duplicate constants.
     //
     bool runOnModule(Module &M);
   };
 
+  const int ConstantMerge::ID = 0;
   RegisterPassX("constmerge","Merge Duplicate Global Constants");
 }
 


Index: llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp
diff -u llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp:1.40 llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp:1.41
--- llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp:1.40	Mon Feb 12 20:10:56 2007
+++ llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp	Tue May  1 16:15:46 2007
@@ -76,6 +76,8 @@
     std::multimap CallSites;
 
   public:
+    static const int ID; // Pass identifcation, replacement for typeid
+    DAE() : ModulePass((intptr_t)&ID) {}
     bool runOnModule(Module &M);
 
     virtual bool ShouldHackArguments() const { return false; }
@@ -93,14 +95,17 @@
 
     void RemoveDeadArgumentsFromFunction(Function *F);
   };
+  const int DAE::ID = 0;
   RegisterPass X("deadargelim", "Dead Argument Elimination");
 
   /// DAH - DeadArgumentHacking pass - Same as dead argument elimination, but
   /// deletes arguments to functions which are external.  This is only for use
   /// by bugpoint.
   struct DAH : public DAE {
+    static const int ID;
     virtual bool ShouldHackArguments() const { return true; }
   };
+  const int DAH::ID = 0;
   RegisterPass Y("deadarghaX0r",
                       "Dead Argument Hacking (BUGPOINT USE ONLY; DO NOT USE)");
 }


Index: llvm/lib/Transforms/IPO/DeadTypeElimination.cpp
diff -u llvm/lib/Transforms/IPO/DeadTypeElimination.cpp:1.62 llvm/lib/Transforms/IPO/DeadTypeElimination.cpp:1.63
--- llvm/lib/Transforms/IPO/DeadTypeElimination.cpp:1.62	Mon Feb  5 17:32:05 2007
+++ llvm/lib/Transforms/IPO/DeadTypeElimination.cpp	Tue May  1 16:15:46 2007
@@ -26,6 +26,9 @@
 
 namespace {
   struct VISIBILITY_HIDDEN DTE : public ModulePass {
+    static const int ID; // Pass identifcation, replacement for typeid
+    DTE() : ModulePass((intptr_t)&ID) {}
+
     // doPassInitialization - For this pass, it removes global symbol table
     // entries for primitive types.  These are never used for linking in GCC and
     // they make the output uglier to look at, so we nuke them.
@@ -40,6 +43,7 @@
       AU.addRequired();
     }
   };
+  const int DTE::ID = 0;
   RegisterPass X("deadtypeelim", "Dead Type Elimination");
 }
 


Index: llvm/lib/Transforms/IPO/ExtractFunction.cpp
diff -u llvm/lib/Transforms/IPO/ExtractFunction.cpp:1.20 llvm/lib/Transforms/IPO/ExtractFunction.cpp:1.21
--- llvm/lib/Transforms/IPO/ExtractFunction.cpp:1.20	Sat Feb 10 19:08:35 2007
+++ llvm/lib/Transforms/IPO/ExtractFunction.cpp	Tue May  1 16:15:46 2007
@@ -25,13 +25,16 @@
     bool deleteFunc;
     bool reLink;
   public:
+    static const int ID; // Pass identifcation, replacement for typeid
+
     /// FunctionExtractorPass - If deleteFn is true, this pass deletes as the
     /// specified function. Otherwise, it deletes as much of the module as
     /// possible, except for the function specified.
     ///
     FunctionExtractorPass(Function *F = 0, bool deleteFn = true,
                           bool relinkCallees = false)
-      : Named(F), deleteFunc(deleteFn), reLink(relinkCallees) {}
+      : ModulePass((intptr_t)&ID), Named(F), deleteFunc(deleteFn), 
+      reLink(relinkCallees) {}
 
     bool runOnModule(Module &M) {
       if (Named == 0) {
@@ -131,6 +134,7 @@
     }
   };
 
+  const int FunctionExtractorPass::ID = 0;
   RegisterPass X("extract", "Function Extractor");
 }
 


Index: llvm/lib/Transforms/IPO/GlobalDCE.cpp
diff -u llvm/lib/Transforms/IPO/GlobalDCE.cpp:1.45 llvm/lib/Transforms/IPO/GlobalDCE.cpp:1.46
--- llvm/lib/Transforms/IPO/GlobalDCE.cpp:1.45	Sun Apr 29 13:02:48 2007
+++ llvm/lib/Transforms/IPO/GlobalDCE.cpp	Tue May  1 16:15:46 2007
@@ -30,6 +30,9 @@
 
 namespace {
   struct VISIBILITY_HIDDEN GlobalDCE : public ModulePass {
+    static const int ID; // Pass identifcation, replacement for typeid
+    GlobalDCE() : ModulePass((intptr_t)&ID) {}
+ 
     // run - Do the GlobalDCE pass on the specified module, optionally updating
     // the specified callgraph to reflect the changes.
     //
@@ -46,6 +49,7 @@
     bool SafeToDestroyConstant(Constant* C);
     bool RemoveUnusedGlobalValue(GlobalValue &GV);
   };
+  const int GlobalDCE::ID = 0;
   RegisterPass X("globaldce", "Dead Global Elimination");
 }
 


Index: llvm/lib/Transforms/IPO/GlobalOpt.cpp
diff -u llvm/lib/Transforms/IPO/GlobalOpt.cpp:1.101 llvm/lib/Transforms/IPO/GlobalOpt.cpp:1.102
--- llvm/lib/Transforms/IPO/GlobalOpt.cpp:1.101	Thu Apr 12 13:32:50 2007
+++ llvm/lib/Transforms/IPO/GlobalOpt.cpp	Tue May  1 16:15:46 2007
@@ -50,6 +50,8 @@
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
       AU.addRequired();
     }
+    static const int ID; // Pass identifcation, replacement for typeid
+    GlobalOpt() : ModulePass((intptr_t)&ID) {}
 
     bool runOnModule(Module &M);
 
@@ -61,6 +63,7 @@
     bool ProcessInternalGlobal(GlobalVariable *GV,Module::global_iterator &GVI);
   };
 
+  const int GlobalOpt::ID = 0;
   RegisterPass X("globalopt", "Global Variable Optimizer");
 }
 


Index: llvm/lib/Transforms/IPO/IPConstantPropagation.cpp
diff -u llvm/lib/Transforms/IPO/IPConstantPropagation.cpp:1.23 llvm/lib/Transforms/IPO/IPConstantPropagation.cpp:1.24
--- llvm/lib/Transforms/IPO/IPConstantPropagation.cpp:1.23	Mon Feb  5 17:32:05 2007
+++ llvm/lib/Transforms/IPO/IPConstantPropagation.cpp	Tue May  1 16:15:46 2007
@@ -33,11 +33,15 @@
   /// IPCP - The interprocedural constant propagation pass
   ///
   struct VISIBILITY_HIDDEN IPCP : public ModulePass {
+    static const int ID; // Pass identifcation, replacement for typeid
+    IPCP() : ModulePass((intptr_t)&ID) {}
+
     bool runOnModule(Module &M);
   private:
     bool PropagateConstantsIntoArguments(Function &F);
     bool PropagateConstantReturn(Function &F);
   };
+  const int IPCP::ID = 0;
   RegisterPass X("ipconstprop", "Interprocedural constant propagation");
 }
 


Index: llvm/lib/Transforms/IPO/IndMemRemoval.cpp
diff -u llvm/lib/Transforms/IPO/IndMemRemoval.cpp:1.15 llvm/lib/Transforms/IPO/IndMemRemoval.cpp:1.16
--- llvm/lib/Transforms/IPO/IndMemRemoval.cpp:1.15	Mon Apr 16 13:10:23 2007
+++ llvm/lib/Transforms/IPO/IndMemRemoval.cpp	Tue May  1 16:15:46 2007
@@ -32,8 +32,12 @@
 namespace {
   class VISIBILITY_HIDDEN IndMemRemPass : public ModulePass {
   public:
+    static const int ID; // Pass identifcation, replacement for typeid
+    IndMemRemPass() : ModulePass((intptr_t)&ID) {}
+
     virtual bool runOnModule(Module &M);
   };
+  const int IndMemRemPass::ID = 0;
   RegisterPass X("indmemrem","Indirect Malloc and Free Removal");
 } // end anonymous namespace
 


Index: llvm/lib/Transforms/IPO/InlineSimple.cpp
diff -u llvm/lib/Transforms/IPO/InlineSimple.cpp:1.78 llvm/lib/Transforms/IPO/InlineSimple.cpp:1.79
--- llvm/lib/Transforms/IPO/InlineSimple.cpp:1.78	Mon Feb  5 17:32:05 2007
+++ llvm/lib/Transforms/IPO/InlineSimple.cpp	Tue May  1 16:15:46 2007
@@ -54,8 +54,10 @@
   class VISIBILITY_HIDDEN SimpleInliner : public Inliner {
     std::map CachedFunctionInfo;
   public:
+    static const int ID; // Pass identifcation, replacement for typeid
     int getInlineCost(CallSite CS);
   };
+  const int SimpleInliner::ID = 0;
   RegisterPass X("inline", "Function Integration/Inlining");
 }
 


Index: llvm/lib/Transforms/IPO/Inliner.cpp
diff -u llvm/lib/Transforms/IPO/Inliner.cpp:1.37 llvm/lib/Transforms/IPO/Inliner.cpp:1.38
--- llvm/lib/Transforms/IPO/Inliner.cpp:1.37	Tue Jan 30 17:28:39 2007
+++ llvm/lib/Transforms/IPO/Inliner.cpp	Tue May  1 16:15:46 2007
@@ -36,7 +36,9 @@
         cl::desc("Control the amount of inlining to perform (default = 200)"));
 }
 
-Inliner::Inliner() : InlineThreshold(InlineLimit) {}
+const int Inliner::ID = 0;
+Inliner::Inliner() 
+  : CallGraphSCCPass((intptr_t)&ID), InlineThreshold(InlineLimit) {}
 
 /// getAnalysisUsage - For this class, we declare that we require and preserve
 /// the call graph.  If the derived class implements this method, it should


Index: llvm/lib/Transforms/IPO/Inliner.h
diff -u llvm/lib/Transforms/IPO/Inliner.h:1.9 llvm/lib/Transforms/IPO/Inliner.h:1.10
--- llvm/lib/Transforms/IPO/Inliner.h:1.9	Tue Jan 30 17:28:39 2007
+++ llvm/lib/Transforms/IPO/Inliner.h	Tue May  1 16:15:46 2007
@@ -27,6 +27,7 @@
 /// perform the inlining operations that does not depend on the policy.
 ///
 struct Inliner : public CallGraphSCCPass {
+  static const int ID;
   Inliner();
 
   /// getAnalysisUsage - For this class, we declare that we require and preserve


Index: llvm/lib/Transforms/IPO/Internalize.cpp
diff -u llvm/lib/Transforms/IPO/Internalize.cpp:1.45 llvm/lib/Transforms/IPO/Internalize.cpp:1.46
--- llvm/lib/Transforms/IPO/Internalize.cpp:1.45	Mon Apr 16 13:10:23 2007
+++ llvm/lib/Transforms/IPO/Internalize.cpp	Tue May  1 16:15:46 2007
@@ -46,16 +46,18 @@
     std::set ExternalNames;
     bool DontInternalize;
   public:
+    static const int ID; // Pass identifcation, replacement for typeid
     InternalizePass(bool InternalizeEverything = true);
     InternalizePass(const std::vector & exportList);
     void LoadFile(const char *Filename);
     virtual bool runOnModule(Module &M);
   };
+  const int InternalizePass::ID = 0;
   RegisterPass X("internalize", "Internalize Global Symbols");
 } // end anonymous namespace
 
 InternalizePass::InternalizePass(bool InternalizeEverything) 
-  : DontInternalize(false){
+  : ModulePass((intptr_t)&ID), DontInternalize(false){
   if (!APIFile.empty())           // If a filename is specified, use it
     LoadFile(APIFile.c_str());
   else if (!APIList.empty())      // Else, if a list is specified, use it.
@@ -66,7 +68,7 @@
 }
 
 InternalizePass::InternalizePass(const std::vector&exportList) 
-  : DontInternalize(false){
+  : ModulePass((intptr_t)&ID), DontInternalize(false){
   for(std::vector::const_iterator itr = exportList.begin();
         itr != exportList.end(); itr++) {
     ExternalNames.insert(*itr);


Index: llvm/lib/Transforms/IPO/LoopExtractor.cpp
diff -u llvm/lib/Transforms/IPO/LoopExtractor.cpp:1.24 llvm/lib/Transforms/IPO/LoopExtractor.cpp:1.25
--- llvm/lib/Transforms/IPO/LoopExtractor.cpp:1.24	Sat Apr  7 00:31:27 2007
+++ llvm/lib/Transforms/IPO/LoopExtractor.cpp	Tue May  1 16:15:46 2007
@@ -34,9 +34,11 @@
   // Module passes to require FunctionPasses, so we can't get loop info if we're
   // not a function pass.
   struct VISIBILITY_HIDDEN LoopExtractor : public FunctionPass {
+    static const int ID; // Pass identifcation, replacement for typeid
     unsigned NumLoops;
 
-    LoopExtractor(unsigned numLoops = ~0) : NumLoops(numLoops) {}
+    LoopExtractor(unsigned numLoops = ~0) 
+      : FunctionPass((intptr_t)&ID), NumLoops(numLoops) {}
 
     virtual bool runOnFunction(Function &F);
 
@@ -49,14 +51,17 @@
     }
   };
 
+  const int LoopExtractor::ID = 0;
   RegisterPass
   X("loop-extract", "Extract loops into new functions");
 
   /// SingleLoopExtractor - For bugpoint.
   struct SingleLoopExtractor : public LoopExtractor {
+    static const int ID; // Pass identifcation, replacement for typeid
     SingleLoopExtractor() : LoopExtractor(1) {}
   };
 
+  const int SingleLoopExtractor::ID = 0;
   RegisterPass
   Y("loop-extract-single", "Extract at most one loop into a new function");
 } // End anonymous namespace
@@ -147,11 +152,15 @@
   class BlockExtractorPass : public ModulePass {
     std::vector BlocksToNotExtract;
   public:
-    BlockExtractorPass(std::vector &B) : BlocksToNotExtract(B) {}
-    BlockExtractorPass() {}
+    static const int ID; // Pass identifcation, replacement for typeid
+    BlockExtractorPass(std::vector &B) 
+      : ModulePass((intptr_t)&ID), BlocksToNotExtract(B) {}
+    BlockExtractorPass() : ModulePass((intptr_t)&ID) {}
 
     bool runOnModule(Module &M);
   };
+
+  const int BlockExtractorPass::ID = 0;
   RegisterPass
   XX("extract-blocks", "Extract Basic Blocks From Module (for bugpoint use)");
 }


Index: llvm/lib/Transforms/IPO/LowerSetJmp.cpp
diff -u llvm/lib/Transforms/IPO/LowerSetJmp.cpp:1.40 llvm/lib/Transforms/IPO/LowerSetJmp.cpp:1.41
--- llvm/lib/Transforms/IPO/LowerSetJmp.cpp:1.40	Mon Feb 12 20:10:56 2007
+++ llvm/lib/Transforms/IPO/LowerSetJmp.cpp	Tue May  1 16:15:46 2007
@@ -109,6 +109,9 @@
 
     bool IsTransformableFunction(const std::string& Name);
   public:
+    static const int ID; // Pass identifcation, replacement for typeid
+    LowerSetJmp() : ModulePass((intptr_t)&ID) {}
+
     void visitCallInst(CallInst& CI);
     void visitInvokeInst(InvokeInst& II);
     void visitReturnInst(ReturnInst& RI);
@@ -118,6 +121,7 @@
     bool doInitialization(Module& M);
   };
 
+  const int LowerSetJmp::ID = 0;
   RegisterPass X("lowersetjmp", "Lower Set Jump");
 } // end anonymous namespace
 


Index: llvm/lib/Transforms/IPO/PruneEH.cpp
diff -u llvm/lib/Transforms/IPO/PruneEH.cpp:1.31 llvm/lib/Transforms/IPO/PruneEH.cpp:1.32
--- llvm/lib/Transforms/IPO/PruneEH.cpp:1.31	Mon Feb 12 20:10:56 2007
+++ llvm/lib/Transforms/IPO/PruneEH.cpp	Tue May  1 16:15:46 2007
@@ -35,6 +35,9 @@
 
 namespace {
   struct VISIBILITY_HIDDEN PruneEH : public CallGraphSCCPass {
+    static const int ID; // Pass identifcation, replacement for typeid
+    PruneEH() : CallGraphSCCPass((intptr_t)&ID) {}
+
     /// DoesNotUnwind - This set contains all of the functions which we have
     /// determined cannot unwind.
     std::set DoesNotUnwind;
@@ -49,6 +52,8 @@
     bool SimplifyFunction(Function *F);
     void DeleteBasicBlock(BasicBlock *BB);
   };
+
+  const int PruneEH::ID = 0;
   RegisterPass X("prune-eh", "Remove unused exception handling info");
 }
 


Index: llvm/lib/Transforms/IPO/RaiseAllocations.cpp
diff -u llvm/lib/Transforms/IPO/RaiseAllocations.cpp:1.40 llvm/lib/Transforms/IPO/RaiseAllocations.cpp:1.41
--- llvm/lib/Transforms/IPO/RaiseAllocations.cpp:1.40	Sun Mar  4 18:00:42 2007
+++ llvm/lib/Transforms/IPO/RaiseAllocations.cpp	Tue May  1 16:15:46 2007
@@ -35,7 +35,9 @@
     Function *MallocFunc;   // Functions in the module we are processing
     Function *FreeFunc;     // Initialized by doPassInitializationVirt
   public:
-    RaiseAllocations() : MallocFunc(0), FreeFunc(0) {}
+    static const int ID; // Pass identifcation, replacement for typeid
+    RaiseAllocations() 
+      : ModulePass((intptr_t)&ID), MallocFunc(0), FreeFunc(0) {}
 
     // doPassInitialization - For the raise allocations pass, this finds a
     // declaration for malloc and free if they exist.
@@ -47,6 +49,7 @@
     bool runOnModule(Module &M);
   };
 
+  const int RaiseAllocations::ID = 0;
   RegisterPass
   X("raiseallocs", "Raise allocations from calls to instructions");
 }  // end anonymous namespace


Index: llvm/lib/Transforms/IPO/SimplifyLibCalls.cpp
diff -u llvm/lib/Transforms/IPO/SimplifyLibCalls.cpp:1.112 llvm/lib/Transforms/IPO/SimplifyLibCalls.cpp:1.113
--- llvm/lib/Transforms/IPO/SimplifyLibCalls.cpp:1.112	Sun Apr 15 00:38:40 2007
+++ llvm/lib/Transforms/IPO/SimplifyLibCalls.cpp	Tue May  1 16:15:46 2007
@@ -152,6 +152,9 @@
 /// @brief A ModulePass for optimizing well-known function calls.
 class VISIBILITY_HIDDEN SimplifyLibCalls : public ModulePass {
 public:
+  static const int ID; // Pass identifcation, replacement for typeid
+  SimplifyLibCalls() : ModulePass((intptr_t)&ID) {}
+
   /// We need some target data for accurate signature details that are
   /// target dependent. So we require target data in our AnalysisUsage.
   /// @brief Require TargetData from AnalysisUsage.
@@ -373,6 +376,7 @@
   TargetData *TD;        ///< Cached TargetData
 };
 
+const int SimplifyLibCalls::ID = 0;
 // Register the pass
 RegisterPass
 X("simplify-libcalls", "Simplify well-known library calls");


Index: llvm/lib/Transforms/IPO/StripDeadPrototypes.cpp
diff -u llvm/lib/Transforms/IPO/StripDeadPrototypes.cpp:1.5 llvm/lib/Transforms/IPO/StripDeadPrototypes.cpp:1.6
--- llvm/lib/Transforms/IPO/StripDeadPrototypes.cpp:1.5	Sun Feb 18 16:10:58 2007
+++ llvm/lib/Transforms/IPO/StripDeadPrototypes.cpp	Tue May  1 16:15:46 2007
@@ -27,9 +27,12 @@
 /// @brief Pass to remove unused function declarations.
 class VISIBILITY_HIDDEN StripDeadPrototypesPass : public ModulePass {
 public:
-  StripDeadPrototypesPass() { }
+  static const int ID; // Pass identifcation, replacement for typeid
+  StripDeadPrototypesPass() : ModulePass((intptr_t)&ID) { }
   virtual bool runOnModule(Module &M);
 };
+
+const int StripDeadPrototypesPass::ID = 0;
 RegisterPass X("strip-dead-prototypes", 
                                         "Strip Unused Function Prototypes");
 


Index: llvm/lib/Transforms/IPO/StripSymbols.cpp
diff -u llvm/lib/Transforms/IPO/StripSymbols.cpp:1.15 llvm/lib/Transforms/IPO/StripSymbols.cpp:1.16
--- llvm/lib/Transforms/IPO/StripSymbols.cpp:1.15	Sun Feb 11 23:18:08 2007
+++ llvm/lib/Transforms/IPO/StripSymbols.cpp	Tue May  1 16:15:47 2007
@@ -37,7 +37,9 @@
   class VISIBILITY_HIDDEN StripSymbols : public ModulePass {
     bool OnlyDebugInfo;
   public:
-    StripSymbols(bool ODI = false) : OnlyDebugInfo(ODI) {}
+    static const int ID; // Pass identifcation, replacement for typeid
+    StripSymbols(bool ODI = false) 
+      : ModulePass((intptr_t)&ID), OnlyDebugInfo(ODI) {}
 
     virtual bool runOnModule(Module &M);
 
@@ -45,6 +47,8 @@
       AU.setPreservesAll();
     }
   };
+
+  const int StripSymbols::ID = 0;
   RegisterPass X("strip", "Strip all symbols from a module");
 }
 





From dpatel at apple.com  Tue May  1 16:17:47 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 1 May 2007 16:17:47 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86CodeEmitter.cpp
	X86FloatingPoint.cpp
Message-ID: <200705012117.l41LHlR2031525@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

X86CodeEmitter.cpp updated: 1.133 -> 1.134
X86FloatingPoint.cpp updated: 1.68 -> 1.69
---
Log message:

Do not use typeinfo to identify pass in pass manager.


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

 X86CodeEmitter.cpp   |    8 ++++++--
 X86FloatingPoint.cpp |    4 ++++
 2 files changed, 10 insertions(+), 2 deletions(-)


Index: llvm/lib/Target/X86/X86CodeEmitter.cpp
diff -u llvm/lib/Target/X86/X86CodeEmitter.cpp:1.133 llvm/lib/Target/X86/X86CodeEmitter.cpp:1.134
--- llvm/lib/Target/X86/X86CodeEmitter.cpp:1.133	Mon Apr 16 13:10:23 2007
+++ llvm/lib/Target/X86/X86CodeEmitter.cpp	Tue May  1 16:15:46 2007
@@ -39,11 +39,14 @@
     MachineCodeEmitter  &MCE;
     bool Is64BitMode;
   public:
+    static const int ID;
     explicit Emitter(TargetMachine &tm, MachineCodeEmitter &mce)
-      : II(0), TD(0), TM(tm), MCE(mce), Is64BitMode(false) {}
+      : MachineFunctionPass((intptr_t)&ID), II(0), TD(0), TM(tm), 
+      MCE(mce), Is64BitMode(false) {}
     Emitter(TargetMachine &tm, MachineCodeEmitter &mce,
             const X86InstrInfo &ii, const TargetData &td, bool is64)
-      : II(&ii), TD(&td), TM(tm), MCE(mce), Is64BitMode(is64) {}
+      : MachineFunctionPass((intptr_t)&ID), II(&ii), TD(&td), TM(tm), 
+      MCE(mce), Is64BitMode(is64) {}
 
     bool runOnMachineFunction(MachineFunction &MF);
 
@@ -79,6 +82,7 @@
     bool isX86_64ExtendedReg(const MachineOperand &MO);
     unsigned determineREX(const MachineInstr &MI);
   };
+  const int Emitter::ID = 0;
 }
 
 /// createX86CodeEmitterPass - Return a pass that emits the collected X86 code


Index: llvm/lib/Target/X86/X86FloatingPoint.cpp
diff -u llvm/lib/Target/X86/X86FloatingPoint.cpp:1.68 llvm/lib/Target/X86/X86FloatingPoint.cpp:1.69
--- llvm/lib/Target/X86/X86FloatingPoint.cpp:1.68	Wed Apr 25 17:13:27 2007
+++ llvm/lib/Target/X86/X86FloatingPoint.cpp	Tue May  1 16:15:46 2007
@@ -52,6 +52,9 @@
 
 namespace {
   struct VISIBILITY_HIDDEN FPS : public MachineFunctionPass {
+    static const int ID;
+    FPS() : MachineFunctionPass((intptr_t)&ID) {}
+
     virtual bool runOnMachineFunction(MachineFunction &MF);
 
     virtual const char *getPassName() const { return "X86 FP Stackifier"; }
@@ -151,6 +154,7 @@
     void handleCondMovFP(MachineBasicBlock::iterator &I);
     void handleSpecialFP(MachineBasicBlock::iterator &I);
   };
+  const int FPS::ID = 0;
 }
 
 FunctionPass *llvm::createX86FloatingPointStackifierPass() { return new FPS(); }





From dpatel at apple.com  Tue May  1 16:17:47 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 1 May 2007 16:17:47 -0500
Subject: [llvm-commits] CVS: llvm/lib/VMCore/AsmWriter.cpp Dominators.cpp
	Pass.cpp PassManager.cpp Verifier.cpp
Message-ID: <200705012117.l41LHlLl031500@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

AsmWriter.cpp updated: 1.279 -> 1.280
Dominators.cpp updated: 1.97 -> 1.98
Pass.cpp updated: 1.87 -> 1.88
PassManager.cpp updated: 1.153 -> 1.154
Verifier.cpp updated: 1.209 -> 1.210
---
Log message:

Do not use typeinfo to identify pass in pass manager.


---
Diffs of the changes:  (+51 -32)

 AsmWriter.cpp   |    2 ++
 Dominators.cpp  |    3 +++
 Pass.cpp        |   29 ++++++++++++++---------------
 PassManager.cpp |   25 +++++++++++++++++--------
 Verifier.cpp    |   24 +++++++++++++++---------
 5 files changed, 51 insertions(+), 32 deletions(-)


Index: llvm/lib/VMCore/AsmWriter.cpp
diff -u llvm/lib/VMCore/AsmWriter.cpp:1.279 llvm/lib/VMCore/AsmWriter.cpp:1.280
--- llvm/lib/VMCore/AsmWriter.cpp:1.279	Sun Apr 29 13:35:00 2007
+++ llvm/lib/VMCore/AsmWriter.cpp	Tue May  1 16:15:47 2007
@@ -135,8 +135,10 @@
 
 }  // end namespace llvm
 
+const int PrintModulePass::ID = 0;
 static RegisterPass
 X("printm", "Print module to stderr");
+const int PrintFunctionPass::ID = 0;
 static RegisterPass
 Y("print","Print function to stderr");
 


Index: llvm/lib/VMCore/Dominators.cpp
diff -u llvm/lib/VMCore/Dominators.cpp:1.97 llvm/lib/VMCore/Dominators.cpp:1.98
--- llvm/lib/VMCore/Dominators.cpp:1.97	Fri Apr 20 19:36:45 2007
+++ llvm/lib/VMCore/Dominators.cpp	Tue May  1 16:15:47 2007
@@ -58,6 +58,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+const int DominatorTree::ID = 0;
 static RegisterPass
 E("domtree", "Dominator Tree Construction", true);
 
@@ -353,6 +354,7 @@
 //  DominanceFrontier Implementation
 //===----------------------------------------------------------------------===//
 
+const int DominanceFrontier::ID = 0;
 static RegisterPass
 G("domfrontier", "Dominance Frontier Construction", true);
 
@@ -833,6 +835,7 @@
 // ETForest implementation
 //===----------------------------------------------------------------------===//
 
+const int ETForest::ID = 0;
 static RegisterPass
 D("etforest", "ET Forest Construction", true);
 


Index: llvm/lib/VMCore/Pass.cpp
diff -u llvm/lib/VMCore/Pass.cpp:1.87 llvm/lib/VMCore/Pass.cpp:1.88
--- llvm/lib/VMCore/Pass.cpp:1.87	Thu Apr 26 16:33:42 2007
+++ llvm/lib/VMCore/Pass.cpp	Tue May  1 16:15:47 2007
@@ -133,7 +133,7 @@
 class PassRegistrar {
   /// PassInfoMap - Keep track of the passinfo object for each registered llvm
   /// pass.
-  std::map PassInfoMap;
+  std::map PassInfoMap;
   
   /// AnalysisGroupInfo - Keep track of information for each analysis group.
   struct AnalysisGroupInfo {
@@ -147,19 +147,19 @@
 
 public:
   
-  const PassInfo *GetPassInfo(const std::type_info &TI) const {
-    std::map::const_iterator I = PassInfoMap.find(TI);
+  const PassInfo *GetPassInfo(intptr_t TI) const {
+    std::map::const_iterator I = PassInfoMap.find(TI);
     return I != PassInfoMap.end() ? I->second : 0;
   }
   
   void RegisterPass(PassInfo &PI) {
     bool Inserted =
-      PassInfoMap.insert(std::make_pair(TypeInfo(PI.getTypeInfo()),&PI)).second;
+      PassInfoMap.insert(std::make_pair(PI.getTypeInfo(),&PI)).second;
     assert(Inserted && "Pass registered multiple times!");
   }
   
   void UnregisterPass(PassInfo &PI) {
-    std::map::iterator I =
+    std::map::iterator I =
       PassInfoMap.find(PI.getTypeInfo());
     assert(I != PassInfoMap.end() && "Pass registered but not in map!");
     
@@ -168,7 +168,7 @@
   }
   
   void EnumerateWith(PassRegistrationListener *L) {
-    for (std::map::const_iterator I = PassInfoMap.begin(),
+    for (std::map::const_iterator I = PassInfoMap.begin(),
          E = PassInfoMap.end(); I != E; ++I)
       L->passEnumerate(I->second);
   }
@@ -210,11 +210,10 @@
 // getPassInfo - Return the PassInfo data structure that corresponds to this
 // pass...
 const PassInfo *Pass::getPassInfo() const {
-  if (PassInfoCache) return PassInfoCache;
-  return lookupPassInfo(typeid(*this));
+  return lookupPassInfo(PassID);
 }
 
-const PassInfo *Pass::lookupPassInfo(const std::type_info &TI) {
+const PassInfo *Pass::lookupPassInfo(intptr_t TI) {
   return getPassRegistrar()->GetPassInfo(TI);
 }
 
@@ -238,12 +237,12 @@
 
 // RegisterAGBase implementation
 //
-RegisterAGBase::RegisterAGBase(const std::type_info &Interface,
-                               const std::type_info *Pass, bool isDefault)
-  : RegisterPassBase(Interface),
+RegisterAGBase::RegisterAGBase(intptr_t InterfaceID,
+                               intptr_t PassID, bool isDefault)
+  : RegisterPassBase(InterfaceID),
     ImplementationInfo(0), isDefaultImplementation(isDefault) {
 
-  InterfaceInfo = const_cast(Pass::lookupPassInfo(Interface));
+  InterfaceInfo = const_cast(Pass::lookupPassInfo(InterfaceID));
   if (InterfaceInfo == 0) {
     // First reference to Interface, register it now.
     registerPass();
@@ -252,8 +251,8 @@
   assert(PIObj.isAnalysisGroup() &&
          "Trying to join an analysis group that is a normal pass!");
 
-  if (Pass) {
-    ImplementationInfo = Pass::lookupPassInfo(*Pass);
+  if (PassID) {
+    ImplementationInfo = Pass::lookupPassInfo(PassID);
     assert(ImplementationInfo &&
            "Must register pass before adding to AnalysisGroup!");
 


Index: llvm/lib/VMCore/PassManager.cpp
diff -u llvm/lib/VMCore/PassManager.cpp:1.153 llvm/lib/VMCore/PassManager.cpp:1.154
--- llvm/lib/VMCore/PassManager.cpp:1.153	Thu Apr 26 12:50:19 2007
+++ llvm/lib/VMCore/PassManager.cpp	Tue May  1 16:15:47 2007
@@ -63,7 +63,9 @@
                                         public FunctionPass {
 
 public:
-  BBPassManager(int Depth) : PMDataManager(Depth) { }
+  static const int ID;
+  BBPassManager(int Depth) 
+    : PMDataManager(Depth), FunctionPass((intptr_t)&ID) {}
 
   /// Execute all of the passes scheduled for execution.  Keep track of
   /// whether any of the passes modifies the function, and if so, return true.
@@ -104,6 +106,7 @@
   }
 };
 
+const int BBPassManager::ID = 0;
 }
 
 namespace llvm {
@@ -116,9 +119,10 @@
                                 public PMDataManager,
                                 public PMTopLevelManager {
 public:
-
-  FunctionPassManagerImpl(int Depth) : PMDataManager(Depth),
-                                       PMTopLevelManager(TLM_Function) { }
+  static const int ID;
+  FunctionPassManagerImpl(int Depth) : 
+    Pass((intptr_t)&ID), PMDataManager(Depth), 
+    PMTopLevelManager(TLM_Function) { }
 
   /// add - Add a pass to the queue of passes to run.  This passes ownership of
   /// the Pass to the PassManager.  When the PassManager is destroyed, the pass
@@ -167,9 +171,9 @@
     FPPassManager *FP = static_cast(PassManagers[N]);
     return FP;
   }
-
 };
 
+const int FunctionPassManagerImpl::ID = 0;
 //===----------------------------------------------------------------------===//
 // MPPassManager
 //
@@ -179,7 +183,8 @@
 class MPPassManager : public Pass, public PMDataManager {
  
 public:
-  MPPassManager(int Depth) : PMDataManager(Depth) { }
+  static const int ID;
+  MPPassManager(int Depth) : Pass((intptr_t)&ID), PMDataManager(Depth) { }
 
   // Delete on the fly managers.
   virtual ~MPPassManager() {
@@ -242,17 +247,19 @@
   std::map OnTheFlyManagers;
 };
 
+const int MPPassManager::ID = 0;
 //===----------------------------------------------------------------------===//
 // PassManagerImpl
 //
+
 /// PassManagerImpl manages MPPassManagers
 class PassManagerImpl : public Pass,
                         public PMDataManager,
                         public PMTopLevelManager {
 
 public:
-
-  PassManagerImpl(int Depth) : PMDataManager(Depth),
+  static const int ID;
+  PassManagerImpl(int Depth) : Pass((intptr_t)&ID), PMDataManager(Depth),
                                PMTopLevelManager(TLM_Pass) { }
 
   /// add - Add a pass to the queue of passes to run.  This passes ownership of
@@ -297,6 +304,7 @@
 
 };
 
+const int PassManagerImpl::ID = 0;
 } // End of llvm namespace
 
 namespace {
@@ -1100,6 +1108,7 @@
 //===----------------------------------------------------------------------===//
 // FPPassManager implementation
 
+const int FPPassManager::ID = 0;
 /// Print passes managed by this manager
 void FPPassManager::dumpPassStructure(unsigned Offset) {
   llvm::cerr << std::string(Offset*2, ' ') << "FunctionPass Manager\n";


Index: llvm/lib/VMCore/Verifier.cpp
diff -u llvm/lib/VMCore/Verifier.cpp:1.209 llvm/lib/VMCore/Verifier.cpp:1.210
--- llvm/lib/VMCore/Verifier.cpp:1.209	Sun Apr 29 13:02:48 2007
+++ llvm/lib/VMCore/Verifier.cpp	Tue May  1 16:15:47 2007
@@ -69,6 +69,7 @@
 
   struct VISIBILITY_HIDDEN
      Verifier : public FunctionPass, InstVisitor {
+    static const int ID; // Pass ID, replacement for typeid
     bool Broken;          // Is this module found to be broken?
     bool RealPass;        // Are we not being run by a PassManager?
     VerifierFailureAction action;
@@ -84,18 +85,22 @@
     SmallPtrSet InstsInThisBlock;
 
     Verifier()
-        : Broken(false), RealPass(true), action(AbortProcessAction),
-          EF(0), msgs( std::ios::app | std::ios::out ) {}
+      : FunctionPass((intptr_t)&ID), 
+      Broken(false), RealPass(true), action(AbortProcessAction),
+      EF(0), msgs( std::ios::app | std::ios::out ) {}
     Verifier( VerifierFailureAction ctn )
-        : Broken(false), RealPass(true), action(ctn), EF(0),
-          msgs( std::ios::app | std::ios::out ) {}
+      : FunctionPass((intptr_t)&ID), 
+      Broken(false), RealPass(true), action(ctn), EF(0),
+      msgs( std::ios::app | std::ios::out ) {}
     Verifier(bool AB )
-        : Broken(false), RealPass(true),
-          action( AB ? AbortProcessAction : PrintMessageAction), EF(0),
-          msgs( std::ios::app | std::ios::out ) {}
+      : FunctionPass((intptr_t)&ID), 
+      Broken(false), RealPass(true),
+      action( AB ? AbortProcessAction : PrintMessageAction), EF(0),
+      msgs( std::ios::app | std::ios::out ) {}
     Verifier(ETForest &ef)
-      : Broken(false), RealPass(false), action(PrintMessageAction),
-        EF(&ef), msgs( std::ios::app | std::ios::out ) {}
+      : FunctionPass((intptr_t)&ID), 
+      Broken(false), RealPass(false), action(PrintMessageAction),
+      EF(&ef), msgs( std::ios::app | std::ios::out ) {}
 
 
     bool doInitialization(Module &M) {
@@ -261,6 +266,7 @@
     }
   };
 
+  const int Verifier::ID = 0;
   RegisterPass X("verify", "Module Verifier");
 } // End anonymous namespace
 





From dpatel at apple.com  Tue May  1 16:17:50 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 1 May 2007 16:17:50 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/ADCE.cpp
	BasicBlockPlacement.cpp CodeGenPrepare.cpp CondPropagate.cpp
	ConstantProp.cpp CorrelatedExprs.cpp DCE.cpp
	DeadStoreElimination.cpp GCSE.cpp IndVarSimplify.cpp
	InstructionCombining.cpp LICM.cpp LoopRotation.cpp
	LoopStrengthReduce.cpp LoopUnroll.cpp LoopUnswitch.cpp
	LowerGC.cpp LowerPacked.cpp PredicateSimplifier.cpp
	Reassociate.cpp Reg2Mem.cpp SCCP.cpp ScalarReplAggregates.cpp
	SimplifyCFG.cpp TailDuplication.cpp TailRecursionElimination.cpp
Message-ID: <200705012117.l41LHoiA031581@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

ADCE.cpp updated: 1.106 -> 1.107
BasicBlockPlacement.cpp updated: 1.9 -> 1.10
CodeGenPrepare.cpp updated: 1.6 -> 1.7
CondPropagate.cpp updated: 1.18 -> 1.19
ConstantProp.cpp updated: 1.56 -> 1.57
CorrelatedExprs.cpp updated: 1.57 -> 1.58
DCE.cpp updated: 1.63 -> 1.64
DeadStoreElimination.cpp updated: 1.17 -> 1.18
GCSE.cpp updated: 1.53 -> 1.54
IndVarSimplify.cpp updated: 1.115 -> 1.116
InstructionCombining.cpp updated: 1.754 -> 1.755
LICM.cpp updated: 1.96 -> 1.97
LoopRotation.cpp updated: 1.10 -> 1.11
LoopStrengthReduce.cpp updated: 1.131 -> 1.132
LoopUnroll.cpp updated: 1.39 -> 1.40
LoopUnswitch.cpp updated: 1.65 -> 1.66
LowerGC.cpp updated: 1.22 -> 1.23
LowerPacked.cpp updated: 1.21 -> 1.22
PredicateSimplifier.cpp updated: 1.71 -> 1.72
Reassociate.cpp updated: 1.78 -> 1.79
Reg2Mem.cpp updated: 1.12 -> 1.13
SCCP.cpp updated: 1.165 -> 1.166
ScalarReplAggregates.cpp updated: 1.90 -> 1.91
SimplifyCFG.cpp updated: 1.21 -> 1.22
TailDuplication.cpp updated: 1.37 -> 1.38
TailRecursionElimination.cpp updated: 1.30 -> 1.31
---
Log message:

Do not use typeinfo to identify pass in pass manager.


---
Diffs of the changes:  (+114 -5)

 ADCE.cpp                     |    4 ++++
 BasicBlockPlacement.cpp      |    4 ++++
 CodeGenPrepare.cpp           |    6 +++++-
 CondPropagate.cpp            |    5 +++++
 ConstantProp.cpp             |    4 ++++
 CorrelatedExprs.cpp          |    5 +++++
 DCE.cpp                      |    7 +++++++
 DeadStoreElimination.cpp     |    3 +++
 GCSE.cpp                     |    4 ++++
 IndVarSimplify.cpp           |    7 ++++++-
 InstructionCombining.cpp     |    4 ++++
 LICM.cpp                     |    4 ++++
 LoopRotation.cpp             |    5 ++++-
 LoopStrengthReduce.cpp       |    5 ++++-
 LoopUnroll.cpp               |    4 ++++
 LoopUnswitch.cpp             |    4 ++++
 LowerGC.cpp                  |    5 ++++-
 LowerPacked.cpp              |    4 ++++
 PredicateSimplifier.cpp      |    4 ++++
 Reassociate.cpp              |    4 ++++
 Reg2Mem.cpp                  |    3 +++
 SCCP.cpp                     |    7 +++++++
 ScalarReplAggregates.cpp     |    4 ++++
 SimplifyCFG.cpp              |    4 ++++
 TailDuplication.cpp          |    5 +++++
 TailRecursionElimination.cpp |    4 ++++
 26 files changed, 114 insertions(+), 5 deletions(-)


Index: llvm/lib/Transforms/Scalar/ADCE.cpp
diff -u llvm/lib/Transforms/Scalar/ADCE.cpp:1.106 llvm/lib/Transforms/Scalar/ADCE.cpp:1.107
--- llvm/lib/Transforms/Scalar/ADCE.cpp:1.106	Wed Apr 18 01:46:57 2007
+++ llvm/lib/Transforms/Scalar/ADCE.cpp	Tue May  1 16:15:47 2007
@@ -52,6 +52,9 @@
   // The public interface for this class
   //
 public:
+  static const int ID; // Pass identifcation, replacement for typeid
+  ADCE() : FunctionPass((intptr_t)&ID) {}
+
   // Execute the Aggressive Dead Code Elimination Algorithm
   //
   virtual bool runOnFunction(Function &F) {
@@ -104,6 +107,7 @@
   }
 };
 
+  const int ADCE::ID = 0;
   RegisterPass X("adce", "Aggressive Dead Code Elimination");
 } // End of anonymous namespace
 


Index: llvm/lib/Transforms/Scalar/BasicBlockPlacement.cpp
diff -u llvm/lib/Transforms/Scalar/BasicBlockPlacement.cpp:1.9 llvm/lib/Transforms/Scalar/BasicBlockPlacement.cpp:1.10
--- llvm/lib/Transforms/Scalar/BasicBlockPlacement.cpp:1.9	Mon Feb  5 17:32:05 2007
+++ llvm/lib/Transforms/Scalar/BasicBlockPlacement.cpp	Tue May  1 16:15:47 2007
@@ -41,6 +41,9 @@
 
 namespace {
   struct VISIBILITY_HIDDEN BlockPlacement : public FunctionPass {
+    static const int ID; // Pass identifcation, replacement for typeid
+    BlockPlacement() : FunctionPass((intptr_t)&ID) {}
+
     virtual bool runOnFunction(Function &F);
 
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
@@ -70,6 +73,7 @@
     void PlaceBlocks(BasicBlock *BB);
   };
 
+  const int BlockPlacement::ID = 0;
   RegisterPass X("block-placement",
                                  "Profile Guided Basic Block Placement");
 }


Index: llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp
diff -u llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp:1.6 llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp:1.7
--- llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp:1.6	Tue Apr 24 19:37:04 2007
+++ llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp	Tue May  1 16:15:47 2007
@@ -39,7 +39,9 @@
     /// transformation profitability.
     const TargetLowering *TLI;
   public:
-    CodeGenPrepare(const TargetLowering *tli = 0) : TLI(tli) {}
+    static const int ID; // Pass identifcation, replacement for typeid
+    CodeGenPrepare(const TargetLowering *tli = 0) : FunctionPass((intptr_t)&ID),
+      TLI(tli) {}
     bool runOnFunction(Function &F);
     
   private:
@@ -52,6 +54,8 @@
                                DenseMap &SunkAddrs);
   };
 }
+
+const int CodeGenPrepare::ID = 0;
 static RegisterPass X("codegenprepare",
                                       "Optimize for code generation");
 


Index: llvm/lib/Transforms/Scalar/CondPropagate.cpp
diff -u llvm/lib/Transforms/Scalar/CondPropagate.cpp:1.18 llvm/lib/Transforms/Scalar/CondPropagate.cpp:1.19
--- llvm/lib/Transforms/Scalar/CondPropagate.cpp:1.18	Thu Mar  1 18:28:52 2007
+++ llvm/lib/Transforms/Scalar/CondPropagate.cpp	Tue May  1 16:15:47 2007
@@ -31,6 +31,9 @@
 
 namespace {
   struct VISIBILITY_HIDDEN CondProp : public FunctionPass {
+    static const int ID; // Pass identifcation, replacement for typeid
+    CondProp() : FunctionPass((intptr_t)&ID) {}
+
     virtual bool runOnFunction(Function &F);
 
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
@@ -45,6 +48,8 @@
     void SimplifyPredecessors(SwitchInst *SI);
     void RevectorBlockTo(BasicBlock *FromBB, BasicBlock *ToBB);
   };
+  
+  const int CondProp::ID = 0;
   RegisterPass X("condprop", "Conditional Propagation");
 }
 


Index: llvm/lib/Transforms/Scalar/ConstantProp.cpp
diff -u llvm/lib/Transforms/Scalar/ConstantProp.cpp:1.56 llvm/lib/Transforms/Scalar/ConstantProp.cpp:1.57
--- llvm/lib/Transforms/Scalar/ConstantProp.cpp:1.56	Mon Feb  5 17:32:05 2007
+++ llvm/lib/Transforms/Scalar/ConstantProp.cpp	Tue May  1 16:15:47 2007
@@ -34,6 +34,9 @@
 
 namespace {
   struct VISIBILITY_HIDDEN ConstantPropagation : public FunctionPass {
+    static const int ID; // Pass identifcation, replacement for typeid
+    ConstantPropagation() : FunctionPass((intptr_t)&ID) {}
+
     bool runOnFunction(Function &F);
 
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
@@ -41,6 +44,7 @@
     }
   };
 
+  const int ConstantPropagation::ID = 0;
   RegisterPass X("constprop",
                                       "Simple constant propagation");
 }


Index: llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp
diff -u llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp:1.57 llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp:1.58
--- llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp:1.57	Wed Apr 18 00:25:43 2007
+++ llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp	Tue May  1 16:15:47 2007
@@ -225,6 +225,9 @@
     std::map RegionInfoMap;
     ETForest *EF;
   public:
+    static const int ID; // Pass identifcation, replacement for typeid
+    CEE() : FunctionPass((intptr_t)&ID) {}
+
     virtual bool runOnFunction(Function &F);
 
     // We don't modify the program, so we preserve all analyses
@@ -284,6 +287,8 @@
     bool SimplifyBasicBlock(BasicBlock &BB, const RegionInfo &RI);
     bool SimplifyInstruction(Instruction *Inst, const RegionInfo &RI);
   };
+  
+  const int CEE::ID = 0;
   RegisterPass X("cee", "Correlated Expression Elimination");
 }
 


Index: llvm/lib/Transforms/Scalar/DCE.cpp
diff -u llvm/lib/Transforms/Scalar/DCE.cpp:1.63 llvm/lib/Transforms/Scalar/DCE.cpp:1.64
--- llvm/lib/Transforms/Scalar/DCE.cpp:1.63	Mon Feb  5 17:32:05 2007
+++ llvm/lib/Transforms/Scalar/DCE.cpp	Tue May  1 16:15:47 2007
@@ -35,6 +35,8 @@
   // DeadInstElimination pass implementation
   //
   struct VISIBILITY_HIDDEN DeadInstElimination : public BasicBlockPass {
+    static const int ID; // Pass identifcation, replacement for typeid
+    DeadInstElimination() : BasicBlockPass(intptr_t(&ID)) {}
     virtual bool runOnBasicBlock(BasicBlock &BB) {
       bool Changed = false;
       for (BasicBlock::iterator DI = BB.begin(); DI != BB.end(); )
@@ -51,6 +53,7 @@
     }
   };
 
+  const int DeadInstElimination::ID = 0;
   RegisterPass X("die", "Dead Instruction Elimination");
 }
 
@@ -64,6 +67,9 @@
   // DeadCodeElimination pass implementation
   //
   struct DCE : public FunctionPass {
+    static const int ID; // Pass identifcation, replacement for typeid
+    DCE() : FunctionPass((intptr_t)&ID) {}
+
     virtual bool runOnFunction(Function &F);
 
      virtual void getAnalysisUsage(AnalysisUsage &AU) const {
@@ -71,6 +77,7 @@
     }
  };
 
+  const int DCE::ID = 0;
   RegisterPass Y("dce", "Dead Code Elimination");
 }
 


Index: llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp
diff -u llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp:1.17 llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp:1.18
--- llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp:1.17	Mon Feb  5 17:32:05 2007
+++ llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp	Tue May  1 16:15:47 2007
@@ -34,6 +34,8 @@
 
 namespace {
   struct VISIBILITY_HIDDEN DSE : public FunctionPass {
+    static const int ID; // Pass identifcation, replacement for typeid
+    DSE() : FunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnFunction(Function &F) {
       bool Changed = false;
@@ -56,6 +58,7 @@
       AU.addPreserved();
     }
   };
+  const int DSE::ID = 0;
   RegisterPass X("dse", "Dead Store Elimination");
 }
 


Index: llvm/lib/Transforms/Scalar/GCSE.cpp
diff -u llvm/lib/Transforms/Scalar/GCSE.cpp:1.53 llvm/lib/Transforms/Scalar/GCSE.cpp:1.54
--- llvm/lib/Transforms/Scalar/GCSE.cpp:1.53	Sat Apr 14 18:32:02 2007
+++ llvm/lib/Transforms/Scalar/GCSE.cpp	Tue May  1 16:15:47 2007
@@ -37,6 +37,9 @@
                           "with constant values");
 namespace {
   struct VISIBILITY_HIDDEN GCSE : public FunctionPass {
+    static const int ID; // Pass identifcation, replacement for typeid
+    GCSE() : FunctionPass((intptr_t)&ID) {}
+
     virtual bool runOnFunction(Function &F);
 
   private:
@@ -51,6 +54,7 @@
     }
   };
 
+  const int GCSE::ID = 0;
   RegisterPass X("gcse", "Global Common Subexpression Elimination");
 }
 


Index: llvm/lib/Transforms/Scalar/IndVarSimplify.cpp
diff -u llvm/lib/Transforms/Scalar/IndVarSimplify.cpp:1.115 llvm/lib/Transforms/Scalar/IndVarSimplify.cpp:1.116
--- llvm/lib/Transforms/Scalar/IndVarSimplify.cpp:1.115	Wed Mar  7 00:39:01 2007
+++ llvm/lib/Transforms/Scalar/IndVarSimplify.cpp	Tue May  1 16:15:47 2007
@@ -68,7 +68,10 @@
     ScalarEvolution *SE;
     bool Changed;
   public:
-    
+
+   static const int ID; // Pass identifcation, replacement for typeid
+   IndVarSimplify() : LoopPass((intptr_t)&ID) {}
+
    bool runOnLoop(Loop *L, LPPassManager &LPM);
    bool doInitialization(Loop *L, LPPassManager &LPM);
    virtual void getAnalysisUsage(AnalysisUsage &AU) const {
@@ -91,6 +94,8 @@
 
     void DeleteTriviallyDeadInstructions(std::set &Insts);
   };
+
+  const int IndVarSimplify::ID = 0;
   RegisterPass X("indvars", "Canonicalize Induction Variables");
 }
 


Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.754 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.755
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.754	Sat Apr 28 00:27:36 2007
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Tue May  1 16:15:47 2007
@@ -76,6 +76,9 @@
     TargetData *TD;
     bool MustPreserveLCSSA;
   public:
+    static const int ID; // Pass identifcation, replacement for typeid
+    InstCombiner() : FunctionPass((intptr_t)&ID) {}
+
     /// AddToWorkList - Add the specified instruction to the worklist if it
     /// isn't already in it.
     void AddToWorkList(Instruction *I) {
@@ -358,6 +361,7 @@
     Value *EvaluateInDifferentType(Value *V, const Type *Ty, bool isSigned);
   };
 
+  const int InstCombiner::ID = 0;
   RegisterPass X("instcombine", "Combine redundant instructions");
 }
 


Index: llvm/lib/Transforms/Scalar/LICM.cpp
diff -u llvm/lib/Transforms/Scalar/LICM.cpp:1.96 llvm/lib/Transforms/Scalar/LICM.cpp:1.97
--- llvm/lib/Transforms/Scalar/LICM.cpp:1.96	Wed Apr 25 13:32:35 2007
+++ llvm/lib/Transforms/Scalar/LICM.cpp	Tue May  1 16:15:47 2007
@@ -63,6 +63,9 @@
                    cl::desc("Disable memory promotion in LICM pass"));
 
   struct VISIBILITY_HIDDEN LICM : public LoopPass {
+    static const int ID; // Pass identifcation, replacement for typeid
+    LICM() : LoopPass((intptr_t)&ID) {}
+
     virtual bool runOnLoop(Loop *L, LPPassManager &LPM);
 
     /// This transformation requires natural loop information & requires that
@@ -201,6 +204,7 @@
                                     std::map &Val2AlMap);
   };
 
+  const int LICM::ID = 0;
   RegisterPass X("licm", "Loop Invariant Code Motion");
 }
 


Index: llvm/lib/Transforms/Scalar/LoopRotation.cpp
diff -u llvm/lib/Transforms/Scalar/LoopRotation.cpp:1.10 llvm/lib/Transforms/Scalar/LoopRotation.cpp:1.11
--- llvm/lib/Transforms/Scalar/LoopRotation.cpp:1.10	Sat Apr 14 18:32:02 2007
+++ llvm/lib/Transforms/Scalar/LoopRotation.cpp	Tue May  1 16:15:47 2007
@@ -44,7 +44,9 @@
   class VISIBILITY_HIDDEN LoopRotate : public LoopPass {
 
   public:
-    
+    static const int ID; // Pass ID, replacement for typeid
+    LoopRotate() : LoopPass((intptr_t)&ID) {}
+
     // Rotate Loop L as many times as possible. Return true if
     // loop is rotated at least once.
     bool runOnLoop(Loop *L, LPPassManager &LPM);
@@ -92,6 +94,7 @@
     SmallVector LoopHeaderInfo;
   };
   
+  const int LoopRotate::ID = 0;
   RegisterPass X ("loop-rotate", "Rotate Loops");
 }
 


Index: llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp
diff -u llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp:1.131 llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp:1.132
--- llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp:1.131	Mon Apr 23 17:42:03 2007
+++ llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp	Tue May  1 16:15:47 2007
@@ -143,7 +143,9 @@
     const TargetLowering *TLI;
 
   public:
-    LoopStrengthReduce(const TargetLowering *tli = NULL) : TLI(tli) {
+    static const int ID; // Pass ID, replacement for typeid
+    LoopStrengthReduce(const TargetLowering *tli = NULL) : 
+      LoopPass((intptr_t)&ID), TLI(tli) {
     }
 
     bool runOnLoop(Loop *L, LPPassManager &LPM);
@@ -186,6 +188,7 @@
                                       Loop *L, bool isOnlyStride);
     void DeleteTriviallyDeadInstructions(std::set &Insts);
   };
+  const int LoopStrengthReduce::ID = 0;
   RegisterPass X("loop-reduce", "Loop Strength Reduction");
 }
 


Index: llvm/lib/Transforms/Scalar/LoopUnroll.cpp
diff -u llvm/lib/Transforms/Scalar/LoopUnroll.cpp:1.39 llvm/lib/Transforms/Scalar/LoopUnroll.cpp:1.40
--- llvm/lib/Transforms/Scalar/LoopUnroll.cpp:1.39	Mon Apr 16 18:03:45 2007
+++ llvm/lib/Transforms/Scalar/LoopUnroll.cpp	Tue May  1 16:15:47 2007
@@ -49,6 +49,9 @@
   class VISIBILITY_HIDDEN LoopUnroll : public LoopPass {
     LoopInfo *LI;  // The current loop information
   public:
+    static const int ID; // Pass ID, replacement for typeid
+    LoopUnroll()  : LoopPass((intptr_t)&ID) {}
+
     bool runOnLoop(Loop *L, LPPassManager &LPM);
     BasicBlock* FoldBlockIntoPredecessor(BasicBlock* BB);
 
@@ -63,6 +66,7 @@
       AU.addPreserved();
     }
   };
+  const int LoopUnroll::ID = 0;
   RegisterPass X("loop-unroll", "Unroll loops");
 }
 


Index: llvm/lib/Transforms/Scalar/LoopUnswitch.cpp
diff -u llvm/lib/Transforms/Scalar/LoopUnswitch.cpp:1.65 llvm/lib/Transforms/Scalar/LoopUnswitch.cpp:1.66
--- llvm/lib/Transforms/Scalar/LoopUnswitch.cpp:1.65	Tue Mar  6 18:26:10 2007
+++ llvm/lib/Transforms/Scalar/LoopUnswitch.cpp	Tue May  1 16:15:47 2007
@@ -69,6 +69,9 @@
     SmallPtrSet UnswitchedVals;
 
   public:
+    static const int ID; // Pass ID, replacement for typeid
+    LoopUnswitch() : LoopPass((intptr_t)&ID) {}
+
     bool runOnLoop(Loop *L, LPPassManager &LPM);
 
     /// This transformation requires natural loop information & requires that
@@ -109,6 +112,7 @@
                            std::vector &Worklist);
     void RemoveLoopFromHierarchy(Loop *L);
   };
+  const int LoopUnswitch::ID = 0;
   RegisterPass X("loop-unswitch", "Unswitch loops");
 }
 


Index: llvm/lib/Transforms/Scalar/LowerGC.cpp
diff -u llvm/lib/Transforms/Scalar/LowerGC.cpp:1.22 llvm/lib/Transforms/Scalar/LowerGC.cpp:1.23
--- llvm/lib/Transforms/Scalar/LowerGC.cpp:1.22	Mon Feb 12 20:10:56 2007
+++ llvm/lib/Transforms/Scalar/LowerGC.cpp	Tue May  1 16:15:47 2007
@@ -47,7 +47,9 @@
     /// had zero roots.
     const Type *MainRootRecordType;
   public:
-    LowerGC() : GCRootInt(0), GCReadInt(0), GCWriteInt(0),
+    static const int ID; // Pass identifcation, replacement for typeid
+    LowerGC() : FunctionPass((intptr_t)&ID), 
+                GCRootInt(0), GCReadInt(0), GCWriteInt(0),
                 GCRead(0), GCWrite(0), RootChain(0), MainRootRecordType(0) {}
     virtual bool doInitialization(Module &M);
     virtual bool runOnFunction(Function &F);
@@ -56,6 +58,7 @@
     const StructType *getRootRecordType(unsigned NumRoots);
   };
 
+  const int LowerGC::ID = 0;
   RegisterPass
   X("lowergc", "Lower GC intrinsics, for GCless code generators");
 }


Index: llvm/lib/Transforms/Scalar/LowerPacked.cpp
diff -u llvm/lib/Transforms/Scalar/LowerPacked.cpp:1.21 llvm/lib/Transforms/Scalar/LowerPacked.cpp:1.22
--- llvm/lib/Transforms/Scalar/LowerPacked.cpp:1.21	Mon Apr 16 13:10:23 2007
+++ llvm/lib/Transforms/Scalar/LowerPacked.cpp	Tue May  1 16:15:47 2007
@@ -40,6 +40,9 @@
 class VISIBILITY_HIDDEN LowerPacked 
   : public FunctionPass, public InstVisitor {
 public:
+    static const int ID; // Pass identifcation, replacement for typeid
+    LowerPacked() : FunctionPass((intptr_t)&ID) {}
+
    /// @brief Lowers packed operations to scalar operations.
    /// @param F The fuction to process
    virtual bool runOnFunction(Function &F);
@@ -104,6 +107,7 @@
    std::vector instrsToRemove;
 };
 
+const int LowerPacked::ID = 0;
 RegisterPass
 X("lower-packed",
   "lowers packed operations to operations on smaller packed datatypes");


Index: llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp
diff -u llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp:1.71 llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp:1.72
--- llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp:1.71	Thu Apr 26 11:42:07 2007
+++ llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp	Tue May  1 16:15:47 2007
@@ -1989,6 +1989,9 @@
     std::vector WorkList;
 
   public:
+    static const int ID; // Pass identifcation, replacement for typeid
+    PredicateSimplifier() : FunctionPass((intptr_t)&ID) {}
+
     bool runOnFunction(Function &F);
 
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
@@ -2374,6 +2377,7 @@
     }
   }
 
+  const int PredicateSimplifier::ID = 0;
   RegisterPass X("predsimplify",
                                       "Predicate Simplifier");
 }


Index: llvm/lib/Transforms/Scalar/Reassociate.cpp
diff -u llvm/lib/Transforms/Scalar/Reassociate.cpp:1.78 llvm/lib/Transforms/Scalar/Reassociate.cpp:1.79
--- llvm/lib/Transforms/Scalar/Reassociate.cpp:1.78	Thu Mar  1 18:28:52 2007
+++ llvm/lib/Transforms/Scalar/Reassociate.cpp	Tue May  1 16:15:47 2007
@@ -69,6 +69,9 @@
     std::map ValueRankMap;
     bool MadeChange;
   public:
+    static const int ID; // Pass identifcation, replacement for typeid
+    Reassociate() : FunctionPass((intptr_t)&ID) {}
+
     bool runOnFunction(Function &F);
 
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
@@ -89,6 +92,7 @@
     void RemoveDeadBinaryOp(Value *V);
   };
 
+  const int Reassociate::ID = 0;
   RegisterPass X("reassociate", "Reassociate expressions");
 }
 


Index: llvm/lib/Transforms/Scalar/Reg2Mem.cpp
diff -u llvm/lib/Transforms/Scalar/Reg2Mem.cpp:1.12 llvm/lib/Transforms/Scalar/Reg2Mem.cpp:1.13
--- llvm/lib/Transforms/Scalar/Reg2Mem.cpp:1.12	Mon Apr 16 13:10:23 2007
+++ llvm/lib/Transforms/Scalar/Reg2Mem.cpp	Tue May  1 16:15:47 2007
@@ -33,6 +33,8 @@
 
 namespace {
   struct VISIBILITY_HIDDEN RegToMem : public FunctionPass {
+    static const int ID; // Pass identifcation, replacement for typeid
+    RegToMem() : FunctionPass((intptr_t)&ID) {}
 
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
       AU.addRequiredID(BreakCriticalEdgesID);
@@ -76,6 +78,7 @@
     }
   };
   
+  const int RegToMem::ID = 0;
   RegisterPass X("reg2mem", "Demote all values to stack slots");
 }
 


Index: llvm/lib/Transforms/Scalar/SCCP.cpp
diff -u llvm/lib/Transforms/Scalar/SCCP.cpp:1.165 llvm/lib/Transforms/Scalar/SCCP.cpp:1.166
--- llvm/lib/Transforms/Scalar/SCCP.cpp:1.165	Sat Apr 14 18:32:02 2007
+++ llvm/lib/Transforms/Scalar/SCCP.cpp	Tue May  1 16:15:47 2007
@@ -1334,6 +1334,9 @@
   /// Sparse Conditional Constant Propagator.
   ///
   struct VISIBILITY_HIDDEN SCCP : public FunctionPass {
+    static const int ID; // Pass identifcation, replacement for typeid
+    SCCP() : FunctionPass((intptr_t)&ID) {}
+
     // runOnFunction - Run the Sparse Conditional Constant Propagation
     // algorithm, and return true if the function was modified.
     //
@@ -1344,6 +1347,7 @@
     }
   };
 
+  const int SCCP::ID = 0;
   RegisterPass X("sccp", "Sparse Conditional Constant Propagation");
 } // end anonymous namespace
 
@@ -1443,9 +1447,12 @@
   /// Constant Propagation.
   ///
   struct VISIBILITY_HIDDEN IPSCCP : public ModulePass {
+    static const int ID;
+    IPSCCP() : ModulePass((intptr_t)&ID) {}
     bool runOnModule(Module &M);
   };
 
+  const int IPSCCP::ID = 0;
   RegisterPass
   Y("ipsccp", "Interprocedural Sparse Conditional Constant Propagation");
 } // end anonymous namespace


Index: llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp
diff -u llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp:1.90 llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp:1.91
--- llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp:1.90	Wed Apr 25 13:32:35 2007
+++ llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp	Tue May  1 16:15:47 2007
@@ -47,6 +47,9 @@
 
 namespace {
   struct VISIBILITY_HIDDEN SROA : public FunctionPass {
+    static const int ID; // Pass identifcation, replacement for typeid
+    SROA() : FunctionPass((intptr_t)&ID) {}
+
     bool runOnFunction(Function &F);
 
     bool performScalarRepl(Function &F);
@@ -81,6 +84,7 @@
     static Instruction *isOnlyCopiedFromConstantGlobal(AllocationInst *AI);
   };
 
+  const int SROA::ID = 0;
   RegisterPass X("scalarrepl", "Scalar Replacement of Aggregates");
 }
 


Index: llvm/lib/Transforms/Scalar/SimplifyCFG.cpp
diff -u llvm/lib/Transforms/Scalar/SimplifyCFG.cpp:1.21 llvm/lib/Transforms/Scalar/SimplifyCFG.cpp:1.22
--- llvm/lib/Transforms/Scalar/SimplifyCFG.cpp:1.21	Wed Apr  4 20:27:02 2007
+++ llvm/lib/Transforms/Scalar/SimplifyCFG.cpp	Tue May  1 16:15:47 2007
@@ -35,8 +35,12 @@
 
 namespace {
   struct VISIBILITY_HIDDEN CFGSimplifyPass : public FunctionPass {
+    static const int ID; // Pass identifcation, replacement for typeid
+    CFGSimplifyPass() : FunctionPass((intptr_t)&ID) {}
+
     virtual bool runOnFunction(Function &F);
   };
+  const int CFGSimplifyPass::ID = 0;
   RegisterPass X("simplifycfg", "Simplify the CFG");
 }
 


Index: llvm/lib/Transforms/Scalar/TailDuplication.cpp
diff -u llvm/lib/Transforms/Scalar/TailDuplication.cpp:1.37 llvm/lib/Transforms/Scalar/TailDuplication.cpp:1.38
--- llvm/lib/Transforms/Scalar/TailDuplication.cpp:1.37	Mon Feb  5 17:32:05 2007
+++ llvm/lib/Transforms/Scalar/TailDuplication.cpp	Tue May  1 16:15:47 2007
@@ -42,10 +42,15 @@
             cl::init(6), cl::Hidden);
   class VISIBILITY_HIDDEN TailDup : public FunctionPass {
     bool runOnFunction(Function &F);
+  public:
+    static const int ID; // Pass identifcation, replacement for typeid
+    TailDup() : FunctionPass((intptr_t)&ID) {}
+
   private:
     inline bool shouldEliminateUnconditionalBranch(TerminatorInst *TI);
     inline void eliminateUnconditionalBranch(BranchInst *BI);
   };
+  const int TailDup::ID = 0;
   RegisterPass X("tailduplicate", "Tail Duplication");
 }
 


Index: llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp
diff -u llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp:1.30 llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp:1.31
--- llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp:1.30	Thu Mar 22 11:38:57 2007
+++ llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp	Tue May  1 16:15:47 2007
@@ -67,6 +67,9 @@
 
 namespace {
   struct VISIBILITY_HIDDEN TailCallElim : public FunctionPass {
+    static const int ID; // Pass identifcation, replacement for typeid
+    TailCallElim() : FunctionPass((intptr_t)&ID) {}
+
     virtual bool runOnFunction(Function &F);
 
   private:
@@ -77,6 +80,7 @@
     bool CanMoveAboveCall(Instruction *I, CallInst *CI);
     Value *CanTransformAccumulatorRecursion(Instruction *I, CallInst *CI);
   };
+  const int TailCallElim::ID = 0;
   RegisterPass X("tailcallelim", "Tail Call Elimination");
 }
 





From dpatel at apple.com  Tue May  1 16:17:57 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 1 May 2007 16:17:57 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/IA64/IA64Bundling.cpp
Message-ID: <200705012117.l41LHvZb031590@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/IA64:

IA64Bundling.cpp updated: 1.8 -> 1.9
---
Log message:

Do not use typeinfo to identify pass in pass manager.


---
Diffs of the changes:  (+4 -1)

 IA64Bundling.cpp |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)


Index: llvm/lib/Target/IA64/IA64Bundling.cpp
diff -u llvm/lib/Target/IA64/IA64Bundling.cpp:1.8 llvm/lib/Target/IA64/IA64Bundling.cpp:1.9
--- llvm/lib/Target/IA64/IA64Bundling.cpp:1.8	Mon Apr 16 13:10:23 2007
+++ llvm/lib/Target/IA64/IA64Bundling.cpp	Tue May  1 16:15:46 2007
@@ -36,12 +36,14 @@
 
 namespace {
   struct IA64BundlingPass : public MachineFunctionPass {
+    static const int ID;
     /// Target machine description which we query for reg. names, data
     /// layout, etc.
     ///
     IA64TargetMachine &TM;
 
-    IA64BundlingPass(IA64TargetMachine &tm) : TM(tm) { }
+    IA64BundlingPass(IA64TargetMachine &tm) 
+      : MachineFunctionPass((intptr_t)&ID), TM(tm) { }
 
     virtual const char *getPassName() const {
       return "IA64 (Itanium) Bundling Pass";
@@ -61,6 +63,7 @@
     // 'fallthrough' code
     std::set PendingRegWrites;
   };
+  const int IA64BundlingPass::ID = 0;
 } // end of anonymous namespace
 
 /// createIA64BundlingPass - Returns a pass that adds STOP (;;) instructions





From dpatel at apple.com  Tue May  1 16:17:57 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 1 May 2007 16:17:57 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/CBackend/CBackend.cpp
Message-ID: <200705012117.l41LHvjF031619@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/CBackend:

CBackend.cpp updated: 1.338 -> 1.339
---
Log message:

Do not use typeinfo to identify pass in pass manager.


---
Diffs of the changes:  (+12 -2)

 CBackend.cpp |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)


Index: llvm/lib/Target/CBackend/CBackend.cpp
diff -u llvm/lib/Target/CBackend/CBackend.cpp:1.338 llvm/lib/Target/CBackend/CBackend.cpp:1.339
--- llvm/lib/Target/CBackend/CBackend.cpp:1.338	Tue Apr 17 04:20:00 2007
+++ llvm/lib/Target/CBackend/CBackend.cpp	Tue May  1 16:15:46 2007
@@ -56,6 +56,10 @@
   /// external functions with the same name.
   ///
   class CBackendNameAllUsedStructsAndMergeFunctions : public ModulePass {
+  public:
+    static const int ID;
+    CBackendNameAllUsedStructsAndMergeFunctions() 
+      : ModulePass((intptr_t)&ID) {}
     void getAnalysisUsage(AnalysisUsage &AU) const {
       AU.addRequired();
     }
@@ -67,6 +71,8 @@
     virtual bool runOnModule(Module &M);
   };
 
+  const int CBackendNameAllUsedStructsAndMergeFunctions::ID = 0;
+
   /// CWriter - This class is the main chunk of code that converts an LLVM
   /// module to a C translation unit.
   class CWriter : public FunctionPass, public InstVisitor {
@@ -82,8 +88,10 @@
     std::set intrinsicPrototypesAlreadyGenerated;
 
   public:
-    CWriter(std::ostream &o) : Out(o), IL(0), Mang(0), LI(0), TheModule(0), 
-                               TAsm(0), TD(0) {}
+    static const int ID;
+    CWriter(std::ostream &o) 
+      : FunctionPass((intptr_t)&ID), Out(o), IL(0), Mang(0), LI(0), 
+        TheModule(0), TAsm(0), TD(0) {}
 
     virtual const char *getPassName() const { return "C backend"; }
 
@@ -256,6 +264,8 @@
   };
 }
 
+const int CWriter::ID = 0;
+
 /// This method inserts names for any unnamed structure types that are used by
 /// the program, and removes names from structure types that are not used by the
 /// program.





From dpatel at apple.com  Tue May  1 16:17:58 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 1 May 2007 16:17:58 -0500
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/AsmPrinter.cpp
	BranchFolding.cpp ELFWriter.cpp ELFWriter.h
	LiveIntervalAnalysis.cpp LiveVariables.cpp MachOWriter.cpp
	MachOWriter.h MachineFunction.cpp MachineModuleInfo.cpp
	PHIElimination.cpp PrologEpilogInserter.cpp
	RegAllocLinearScan.cpp RegAllocLocal.cpp RegAllocSimple.cpp
	TwoAddressInstructionPass.cpp UnreachableBlockElim.cpp
Message-ID: <200705012117.l41LHwOW031630@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen:

AsmPrinter.cpp updated: 1.160 -> 1.161
BranchFolding.cpp updated: 1.46 -> 1.47
ELFWriter.cpp updated: 1.38 -> 1.39
ELFWriter.h updated: 1.1 -> 1.2
LiveIntervalAnalysis.cpp updated: 1.239 -> 1.240
LiveVariables.cpp updated: 1.79 -> 1.80
MachOWriter.cpp updated: 1.32 -> 1.33
MachOWriter.h updated: 1.3 -> 1.4
MachineFunction.cpp updated: 1.111 -> 1.112
MachineModuleInfo.cpp updated: 1.5 -> 1.6
PHIElimination.cpp updated: 1.57 -> 1.58
PrologEpilogInserter.cpp updated: 1.84 -> 1.85
RegAllocLinearScan.cpp updated: 1.145 -> 1.146
RegAllocLocal.cpp updated: 1.102 -> 1.103
RegAllocSimple.cpp updated: 1.83 -> 1.84
TwoAddressInstructionPass.cpp updated: 1.47 -> 1.48
UnreachableBlockElim.cpp updated: 1.9 -> 1.10
---
Log message:

Do not use typeinfo to identify pass in pass manager.


---
Diffs of the changes:  (+64 -7)

 AsmPrinter.cpp                |    3 ++-
 BranchFolding.cpp             |    4 ++++
 ELFWriter.cpp                 |    4 +++-
 ELFWriter.h                   |    2 ++
 LiveIntervalAnalysis.cpp      |    1 +
 LiveVariables.cpp             |    1 +
 MachOWriter.cpp               |    4 +++-
 MachOWriter.h                 |    1 +
 MachineFunction.cpp           |   11 +++++++++--
 MachineModuleInfo.cpp         |    9 ++++++++-
 PHIElimination.cpp            |    4 ++++
 PrologEpilogInserter.cpp      |    4 ++++
 RegAllocLinearScan.cpp        |    4 ++++
 RegAllocLocal.cpp             |    5 +++++
 RegAllocSimple.cpp            |    6 +++++-
 TwoAddressInstructionPass.cpp |    4 ++++
 UnreachableBlockElim.cpp      |    4 ++++
 17 files changed, 64 insertions(+), 7 deletions(-)


Index: llvm/lib/CodeGen/AsmPrinter.cpp
diff -u llvm/lib/CodeGen/AsmPrinter.cpp:1.160 llvm/lib/CodeGen/AsmPrinter.cpp:1.161
--- llvm/lib/CodeGen/AsmPrinter.cpp:1.160	Mon Apr 30 12:00:18 2007
+++ llvm/lib/CodeGen/AsmPrinter.cpp	Tue May  1 16:15:46 2007
@@ -32,9 +32,10 @@
 static cl::opt
 AsmVerbose("asm-verbose", cl::Hidden, cl::desc("Add comments to directives."));
 
+const int AsmPrinter::ID = 0;
 AsmPrinter::AsmPrinter(std::ostream &o, TargetMachine &tm,
                        const TargetAsmInfo *T)
-: FunctionNumber(0), O(o), TM(tm), TAI(T)
+  : MachineFunctionPass((intptr_t)&ID), FunctionNumber(0), O(o), TM(tm), TAI(T)
 {}
 
 std::string AsmPrinter::getSectionForFunction(const Function &F) const {


Index: llvm/lib/CodeGen/BranchFolding.cpp
diff -u llvm/lib/CodeGen/BranchFolding.cpp:1.46 llvm/lib/CodeGen/BranchFolding.cpp:1.47
--- llvm/lib/CodeGen/BranchFolding.cpp:1.46	Mon Apr 30 18:35:00 2007
+++ llvm/lib/CodeGen/BranchFolding.cpp	Tue May  1 16:15:46 2007
@@ -39,6 +39,9 @@
 
 namespace {
   struct BranchFolder : public MachineFunctionPass {
+    static const int ID;
+    BranchFolder() : MachineFunctionPass((intptr_t)&ID) {}
+
     virtual bool runOnMachineFunction(MachineFunction &MF);
     virtual const char *getPassName() const { return "Control Flow Optimizer"; }
     const TargetInstrInfo *TII;
@@ -64,6 +67,7 @@
                         MachineBasicBlock *TBB, MachineBasicBlock *FBB,
                         const std::vector &Cond);
   };
+  const int BranchFolder::ID = 0;
 }
 
 FunctionPass *llvm::createBranchFoldingPass() { return new BranchFolder(); }


Index: llvm/lib/CodeGen/ELFWriter.cpp
diff -u llvm/lib/CodeGen/ELFWriter.cpp:1.38 llvm/lib/CodeGen/ELFWriter.cpp:1.39
--- llvm/lib/CodeGen/ELFWriter.cpp:1.38	Tue Feb 13 23:52:17 2007
+++ llvm/lib/CodeGen/ELFWriter.cpp	Tue May  1 16:15:46 2007
@@ -47,6 +47,7 @@
 #include 
 using namespace llvm;
 
+const int ELFWriter::ID = 0;
 /// AddELFWriter - Concrete function to add the ELF writer to the function pass
 /// manager.
 MachineCodeEmitter *llvm::AddELFWriter(FunctionPassManager &FPM,
@@ -176,7 +177,8 @@
 //                          ELFWriter Implementation
 //===----------------------------------------------------------------------===//
 
-ELFWriter::ELFWriter(std::ostream &o, TargetMachine &tm) : O(o), TM(tm) {
+ELFWriter::ELFWriter(std::ostream &o, TargetMachine &tm) 
+  : MachineFunctionPass((intptr_t)&ID), O(o), TM(tm) {
   e_flags = 0;    // e_flags defaults to 0, no flags.
 
   is64Bit = TM.getTargetData()->getPointerSizeInBits() == 64;


Index: llvm/lib/CodeGen/ELFWriter.h
diff -u llvm/lib/CodeGen/ELFWriter.h:1.1 llvm/lib/CodeGen/ELFWriter.h:1.2
--- llvm/lib/CodeGen/ELFWriter.h:1.1	Wed Feb  7 19:30:50 2007
+++ llvm/lib/CodeGen/ELFWriter.h	Tue May  1 16:15:46 2007
@@ -30,6 +30,8 @@
   class ELFWriter : public MachineFunctionPass {
     friend class ELFCodeEmitter;
   public:
+    static const int ID;
+
     MachineCodeEmitter &getMachineCodeEmitter() const {
       return *(MachineCodeEmitter*)MCE;
     }


Index: llvm/lib/CodeGen/LiveIntervalAnalysis.cpp
diff -u llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.239 llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.240
--- llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.239	Thu Apr 26 13:59:33 2007
+++ llvm/lib/CodeGen/LiveIntervalAnalysis.cpp	Tue May  1 16:15:46 2007
@@ -45,6 +45,7 @@
 STATISTIC(numAborts   , "Number of times interval joining aborted");
 
 namespace {
+  const int LiveIntervals::ID = 0;
   RegisterPass X("liveintervals", "Live Interval Analysis");
 
   static cl::opt


Index: llvm/lib/CodeGen/LiveVariables.cpp
diff -u llvm/lib/CodeGen/LiveVariables.cpp:1.79 llvm/lib/CodeGen/LiveVariables.cpp:1.80
--- llvm/lib/CodeGen/LiveVariables.cpp:1.79	Thu Apr 26 13:59:33 2007
+++ llvm/lib/CodeGen/LiveVariables.cpp	Tue May  1 16:15:46 2007
@@ -37,6 +37,7 @@
 #include 
 using namespace llvm;
 
+const int LiveVariables::ID = 0;
 static RegisterPass X("livevars", "Live Variable Analysis");
 
 void LiveVariables::VarInfo::dump() const {


Index: llvm/lib/CodeGen/MachOWriter.cpp
diff -u llvm/lib/CodeGen/MachOWriter.cpp:1.32 llvm/lib/CodeGen/MachOWriter.cpp:1.33
--- llvm/lib/CodeGen/MachOWriter.cpp:1.32	Sat Mar  3 22:41:04 2007
+++ llvm/lib/CodeGen/MachOWriter.cpp	Tue May  1 16:15:46 2007
@@ -317,7 +317,9 @@
 //                          MachOWriter Implementation
 //===----------------------------------------------------------------------===//
 
-MachOWriter::MachOWriter(std::ostream &o, TargetMachine &tm) : O(o), TM(tm) {
+const int MachOWriter::ID = 0;
+MachOWriter::MachOWriter(std::ostream &o, TargetMachine &tm) 
+  : MachineFunctionPass((intptr_t)&ID), O(o), TM(tm) {
   is64Bit = TM.getTargetData()->getPointerSizeInBits() == 64;
   isLittleEndian = TM.getTargetData()->isLittleEndian();
 


Index: llvm/lib/CodeGen/MachOWriter.h
diff -u llvm/lib/CodeGen/MachOWriter.h:1.3 llvm/lib/CodeGen/MachOWriter.h:1.4
--- llvm/lib/CodeGen/MachOWriter.h:1.3	Mon Apr 16 13:10:22 2007
+++ llvm/lib/CodeGen/MachOWriter.h	Tue May  1 16:15:46 2007
@@ -84,6 +84,7 @@
   class MachOWriter : public MachineFunctionPass {
     friend class MachOCodeEmitter;
   public:
+    static const int ID;
     MachineCodeEmitter &getMachineCodeEmitter() const {
       return *(MachineCodeEmitter*)MCE;
     }


Index: llvm/lib/CodeGen/MachineFunction.cpp
diff -u llvm/lib/CodeGen/MachineFunction.cpp:1.111 llvm/lib/CodeGen/MachineFunction.cpp:1.112
--- llvm/lib/CodeGen/MachineFunction.cpp:1.111	Wed Apr 25 17:10:09 2007
+++ llvm/lib/CodeGen/MachineFunction.cpp	Tue May  1 16:15:46 2007
@@ -44,11 +44,13 @@
 
 namespace {
   struct VISIBILITY_HIDDEN Printer : public MachineFunctionPass {
+    static const int ID;
+
     std::ostream *OS;
     const std::string Banner;
 
-    Printer (std::ostream *_OS, const std::string &_Banner) :
-      OS (_OS), Banner (_Banner) { }
+    Printer (std::ostream *_OS, const std::string &_Banner) 
+      : MachineFunctionPass((intptr_t)&ID), OS (_OS), Banner (_Banner) { }
 
     const char *getPassName() const { return "MachineFunction Printer"; }
 
@@ -62,6 +64,7 @@
       return false;
     }
   };
+  const int Printer::ID = 0;
 }
 
 /// Returns a newly-created MachineFunction Printer pass. The default output
@@ -74,6 +77,9 @@
 
 namespace {
   struct VISIBILITY_HIDDEN Deleter : public MachineFunctionPass {
+    static const int ID;
+    Deleter() : MachineFunctionPass((intptr_t)&ID) {}
+
     const char *getPassName() const { return "Machine Code Deleter"; }
 
     bool runOnMachineFunction(MachineFunction &MF) {
@@ -82,6 +88,7 @@
       return true;
     }
   };
+  const int Deleter::ID = 0;
 }
 
 /// MachineCodeDeletion Pass - This pass deletes all of the machine code for


Index: llvm/lib/CodeGen/MachineModuleInfo.cpp
diff -u llvm/lib/CodeGen/MachineModuleInfo.cpp:1.5 llvm/lib/CodeGen/MachineModuleInfo.cpp:1.6
--- llvm/lib/CodeGen/MachineModuleInfo.cpp:1.5	Thu Mar  1 14:25:32 2007
+++ llvm/lib/CodeGen/MachineModuleInfo.cpp	Tue May  1 16:15:46 2007
@@ -28,6 +28,7 @@
 
 // Handle the Pass registration stuff necessary to use TargetData's.
 namespace {
+  const int MachineModuleInfo::ID = 0;
   RegisterPass X("machinemoduleinfo", "Module Information");
 }
 
@@ -1462,7 +1463,8 @@
 //===----------------------------------------------------------------------===//
 
 MachineModuleInfo::MachineModuleInfo()
-: DR()
+: ImmutablePass((intptr_t)&ID)
+, DR()
 , VR()
 , CompileUnits()
 , Directories()
@@ -1749,10 +1751,15 @@
 namespace llvm {
 
 struct DebugLabelFolder : public MachineFunctionPass {
+  static const int ID;
+  DebugLabelFolder() : MachineFunctionPass((intptr_t)&ID) {}
+
   virtual bool runOnMachineFunction(MachineFunction &MF);
   virtual const char *getPassName() const { return "Label Folder"; }
 };
 
+const int  DebugLabelFolder::ID = 0;
+
 bool DebugLabelFolder::runOnMachineFunction(MachineFunction &MF) {
   // Get machine module info.
   MachineModuleInfo *MMI = getAnalysisToUpdate();


Index: llvm/lib/CodeGen/PHIElimination.cpp
diff -u llvm/lib/CodeGen/PHIElimination.cpp:1.57 llvm/lib/CodeGen/PHIElimination.cpp:1.58
--- llvm/lib/CodeGen/PHIElimination.cpp:1.57	Wed Apr 18 00:04:38 2007
+++ llvm/lib/CodeGen/PHIElimination.cpp	Tue May  1 16:15:46 2007
@@ -33,6 +33,9 @@
 
 namespace {
   struct VISIBILITY_HIDDEN PNE : public MachineFunctionPass {
+    static const int ID; // Pass identifcation, replacement for typeid
+    PNE() : MachineFunctionPass((intptr_t)&ID) {}
+
     bool runOnMachineFunction(MachineFunction &Fn) {
       analyzePHINodes(Fn);
 
@@ -73,6 +76,7 @@
     VRegPHIUse VRegPHIUseCount;
   };
 
+  const int PNE::ID = 0;
   RegisterPass X("phi-node-elimination",
                       "Eliminate PHI nodes for register allocation");
 }


Index: llvm/lib/CodeGen/PrologEpilogInserter.cpp
diff -u llvm/lib/CodeGen/PrologEpilogInserter.cpp:1.84 llvm/lib/CodeGen/PrologEpilogInserter.cpp:1.85
--- llvm/lib/CodeGen/PrologEpilogInserter.cpp:1.84	Tue May  1 04:01:42 2007
+++ llvm/lib/CodeGen/PrologEpilogInserter.cpp	Tue May  1 16:15:46 2007
@@ -32,6 +32,9 @@
 
 namespace {
   struct VISIBILITY_HIDDEN PEI : public MachineFunctionPass {
+    static const int ID;
+    PEI() : MachineFunctionPass((intptr_t)&ID) {}
+
     const char *getPassName() const {
       return "Prolog/Epilog Insertion & Frame Finalization";
     }
@@ -98,6 +101,7 @@
     void replaceFrameIndices(MachineFunction &Fn);
     void insertPrologEpilogCode(MachineFunction &Fn);
   };
+  const int PEI::ID = 0;
 }
 
 


Index: llvm/lib/CodeGen/RegAllocLinearScan.cpp
diff -u llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.145 llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.146
--- llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.145	Wed Apr 25 17:11:48 2007
+++ llvm/lib/CodeGen/RegAllocLinearScan.cpp	Tue May  1 16:15:46 2007
@@ -48,6 +48,9 @@
   static unsigned numIntervals = 0;
 
   struct VISIBILITY_HIDDEN RA : public MachineFunctionPass {
+    static const int ID;
+    RA() : MachineFunctionPass((intptr_t)&ID) {}
+
     typedef std::pair IntervalPtr;
     typedef std::vector IntervalPtrs;
   private:
@@ -146,6 +149,7 @@
       }
     }
   };
+  const int RA::ID = 0;
 }
 
 void RA::ComputeRelatedRegClasses() {


Index: llvm/lib/CodeGen/RegAllocLocal.cpp
diff -u llvm/lib/CodeGen/RegAllocLocal.cpp:1.102 llvm/lib/CodeGen/RegAllocLocal.cpp:1.103
--- llvm/lib/CodeGen/RegAllocLocal.cpp:1.102	Wed Apr 25 17:11:48 2007
+++ llvm/lib/CodeGen/RegAllocLocal.cpp	Tue May  1 16:15:46 2007
@@ -43,6 +43,10 @@
 
 
   class VISIBILITY_HIDDEN RA : public MachineFunctionPass {
+  public:
+    static const int ID;
+    RA() : MachineFunctionPass((intptr_t)&ID) {}
+  private:
     const TargetMachine *TM;
     MachineFunction *MF;
     const MRegisterInfo *RegInfo;
@@ -224,6 +228,7 @@
     void reloadPhysReg(MachineBasicBlock &MBB, MachineBasicBlock::iterator &I,
                        unsigned PhysReg);
   };
+  const int RA::ID = 0;
 }
 
 /// getStackSpaceFor - This allocates space for the specified virtual register


Index: llvm/lib/CodeGen/RegAllocSimple.cpp
diff -u llvm/lib/CodeGen/RegAllocSimple.cpp:1.83 llvm/lib/CodeGen/RegAllocSimple.cpp:1.84
--- llvm/lib/CodeGen/RegAllocSimple.cpp:1.83	Wed Apr 25 17:11:48 2007
+++ llvm/lib/CodeGen/RegAllocSimple.cpp	Tue May  1 16:15:46 2007
@@ -38,6 +38,10 @@
                    createSimpleRegisterAllocator);
 
   class VISIBILITY_HIDDEN RegAllocSimple : public MachineFunctionPass {
+  public:
+    static const int ID;
+    RegAllocSimple() : MachineFunctionPass((intptr_t)&ID) {}
+  private:
     MachineFunction *MF;
     const TargetMachine *TM;
     const MRegisterInfo *RegInfo;
@@ -90,7 +94,7 @@
     void spillVirtReg(MachineBasicBlock &MBB, MachineBasicBlock::iterator I,
                       unsigned VirtReg, unsigned PhysReg);
   };
-
+  const int RegAllocSimple::ID = 0;
 }
 
 /// getStackSpaceFor - This allocates space for the specified virtual


Index: llvm/lib/CodeGen/TwoAddressInstructionPass.cpp
diff -u llvm/lib/CodeGen/TwoAddressInstructionPass.cpp:1.47 llvm/lib/CodeGen/TwoAddressInstructionPass.cpp:1.48
--- llvm/lib/CodeGen/TwoAddressInstructionPass.cpp:1.47	Wed Apr 18 00:04:38 2007
+++ llvm/lib/CodeGen/TwoAddressInstructionPass.cpp	Tue May  1 16:15:46 2007
@@ -50,12 +50,16 @@
 namespace {
   struct VISIBILITY_HIDDEN TwoAddressInstructionPass
    : public MachineFunctionPass {
+    static const int ID; // Pass identifcation, replacement for typeid
+    TwoAddressInstructionPass() : MachineFunctionPass((intptr_t)&ID) {}
+
     virtual void getAnalysisUsage(AnalysisUsage &AU) const;
 
     /// runOnMachineFunction - pass entry point
     bool runOnMachineFunction(MachineFunction&);
   };
 
+  const int TwoAddressInstructionPass::ID = 0;
   RegisterPass
   X("twoaddressinstruction", "Two-Address instruction pass");
 }


Index: llvm/lib/CodeGen/UnreachableBlockElim.cpp
diff -u llvm/lib/CodeGen/UnreachableBlockElim.cpp:1.9 llvm/lib/CodeGen/UnreachableBlockElim.cpp:1.10
--- llvm/lib/CodeGen/UnreachableBlockElim.cpp:1.9	Sun Aug 27 17:42:51 2006
+++ llvm/lib/CodeGen/UnreachableBlockElim.cpp	Tue May  1 16:15:46 2007
@@ -34,7 +34,11 @@
 namespace {
   class VISIBILITY_HIDDEN UnreachableBlockElim : public FunctionPass {
     virtual bool runOnFunction(Function &F);
+  public:
+    static const int ID; // Pass identifcation, replacement for typeid
+    UnreachableBlockElim() : FunctionPass((intptr_t)&ID) {}
   };
+  const int UnreachableBlockElim::ID = 0;
   RegisterPass
   X("unreachableblockelim", "Remove unreachable blocks from the CFG");
 }





From dpatel at apple.com  Tue May  1 16:17:58 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 1 May 2007 16:17:58 -0500
Subject: [llvm-commits] CVS:
	llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h
Message-ID: <200705012117.l41LHwTi031635@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Transforms/Utils:

UnifyFunctionExitNodes.h updated: 1.20 -> 1.21
---
Log message:

Do not use typeinfo to identify pass in pass manager.


---
Diffs of the changes:  (+3 -1)

 UnifyFunctionExitNodes.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)


Index: llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h
diff -u llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h:1.20 llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h:1.21
--- llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h:1.20	Fri Jun  2 13:40:06 2006
+++ llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h	Tue May  1 16:15:46 2007
@@ -25,7 +25,9 @@
 struct UnifyFunctionExitNodes : public FunctionPass {
   BasicBlock *ReturnBlock, *UnwindBlock, *UnreachableBlock;
 public:
-  UnifyFunctionExitNodes() : ReturnBlock(0), UnwindBlock(0) {}
+  static const int ID; // Pass identifcation, replacement for typeid
+  UnifyFunctionExitNodes() : FunctionPass((intptr_t)&ID),
+                             ReturnBlock(0), UnwindBlock(0) {}
 
   // We can preserve non-critical-edgeness when we unify function exit nodes
   virtual void getAnalysisUsage(AnalysisUsage &AU) const;





From dpatel at apple.com  Tue May  1 16:17:58 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 1 May 2007 16:17:58 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/CallGraphSCCPass.h Pass.h
	PassManagers.h PassSupport.h
Message-ID: <200705012117.l41LHwf5031648@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

CallGraphSCCPass.h updated: 1.12 -> 1.13
Pass.h updated: 1.86 -> 1.87
PassManagers.h updated: 1.16 -> 1.17
PassSupport.h updated: 1.38 -> 1.39
---
Log message:

Do not use typeinfo to identify pass in pass manager.


---
Diffs of the changes:  (+29 -19)

 CallGraphSCCPass.h |    2 ++
 Pass.h             |   16 +++++++++++-----
 PassManagers.h     |    4 +++-
 PassSupport.h      |   26 +++++++++++++-------------
 4 files changed, 29 insertions(+), 19 deletions(-)


Index: llvm/include/llvm/CallGraphSCCPass.h
diff -u llvm/include/llvm/CallGraphSCCPass.h:1.12 llvm/include/llvm/CallGraphSCCPass.h:1.13
--- llvm/include/llvm/CallGraphSCCPass.h:1.12	Mon Apr 16 13:51:25 2007
+++ llvm/include/llvm/CallGraphSCCPass.h	Tue May  1 16:15:46 2007
@@ -31,6 +31,8 @@
 
 struct CallGraphSCCPass : public Pass {
 
+  CallGraphSCCPass(intptr_t pid) : Pass(pid) {}
+
   /// doInitialization - This method is called before the SCC's of the program
   /// has been processed, allowing the pass to do initialization as necessary.
   virtual bool doInitialization(CallGraph &CG) {


Index: llvm/include/llvm/Pass.h
diff -u llvm/include/llvm/Pass.h:1.86 llvm/include/llvm/Pass.h:1.87
--- llvm/include/llvm/Pass.h:1.86	Thu Apr 26 16:33:41 2007
+++ llvm/include/llvm/Pass.h	Tue May  1 16:15:46 2007
@@ -34,8 +34,8 @@
 #include 
 #include 
 #include 
-#include 
 #include 
+#include 
 
 namespace llvm {
 
@@ -77,7 +77,7 @@
 ///
 class Pass {
   AnalysisResolver *Resolver;  // Used to resolve analysis
-  const PassInfo *PassInfoCache;
+  intptr_t PassID;
 
   // AnalysisImpls - This keeps track of which passes implement the interfaces
   // that are required by the current pass (to implement getAnalysis()).
@@ -87,7 +87,7 @@
   void operator=(const Pass&);  // DO NOT IMPLEMENT
   Pass(const Pass &);           // DO NOT IMPLEMENT
 public:
-  Pass() : Resolver(0), PassInfoCache(0) {}
+  Pass(intptr_t pid) : Resolver(0), PassID(pid) {}
   virtual ~Pass();
 
   /// getPassName - Return a nice clean name for a pass.  This usually
@@ -163,12 +163,12 @@
 
   template
   static const PassInfo *getClassPassInfo() {
-    return lookupPassInfo(typeid(AnalysisClass));
+    return lookupPassInfo((intptr_t)&AnalysisClass::ID);
   }
 
   // lookupPassInfo - Return the pass info object for the specified pass class,
   // or null if it is not known.
-  static const PassInfo *lookupPassInfo(const std::type_info &TI);
+  static const PassInfo *lookupPassInfo(intptr_t TI);
 
   /// getAnalysisToUpdate() - This function is used by subclasses
   /// to get to the analysis information that might be around that needs to be
@@ -232,6 +232,7 @@
     return PMT_ModulePassManager;
   }
 
+  ModulePass(intptr_t pid) : Pass(pid) {}
   // Force out-of-line virtual method.
   virtual ~ModulePass();
 };
@@ -256,6 +257,7 @@
   ///
   virtual bool runOnModule(Module &M) { return false; }
 
+  ImmutablePass(intptr_t pid) : ModulePass(pid) {}
   // Force out-of-line virtual method.
   virtual ~ImmutablePass();
 };
@@ -271,6 +273,8 @@
 ///
 class FunctionPass : public Pass {
 public:
+  FunctionPass(intptr_t pid) : Pass(pid) {}
+
   /// doInitialization - Virtual method overridden by subclasses to do
   /// any necessary per-module initialization.
   ///
@@ -320,6 +324,8 @@
 ///
 class BasicBlockPass : public Pass {
 public:
+  BasicBlockPass(intptr_t pid) : Pass(pid) {}
+
   /// doInitialization - Virtual method overridden by subclasses to do
   /// any necessary per-module initialization.
   ///


Index: llvm/include/llvm/PassManagers.h
diff -u llvm/include/llvm/PassManagers.h:1.16 llvm/include/llvm/PassManagers.h:1.17
--- llvm/include/llvm/PassManagers.h:1.16	Mon Apr 16 15:12:57 2007
+++ llvm/include/llvm/PassManagers.h	Tue May  1 16:15:46 2007
@@ -336,7 +336,9 @@
 class FPPassManager : public ModulePass, public PMDataManager {
  
 public:
-  explicit FPPassManager(int Depth) : PMDataManager(Depth) { }
+  static const int ID;
+  explicit FPPassManager(int Depth) 
+  : ModulePass((intptr_t)&ID), PMDataManager(Depth) { }
   
   /// 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.


Index: llvm/include/llvm/PassSupport.h
diff -u llvm/include/llvm/PassSupport.h:1.38 llvm/include/llvm/PassSupport.h:1.39
--- llvm/include/llvm/PassSupport.h:1.38	Mon Apr 16 13:10:22 2007
+++ llvm/include/llvm/PassSupport.h	Tue May  1 16:15:46 2007
@@ -37,19 +37,19 @@
 class PassInfo {
   const char           *PassName;      // Nice name for Pass
   const char           *PassArgument;  // Command Line argument to run this pass
-  const std::type_info &TypeInfo;      // type_info object for this Pass class
+  intptr_t             PassID;      
   bool IsCFGOnlyPass;                  // Pass only looks at the CFG.
   bool IsAnalysisGroup;                // True if an analysis group.
   std::vector ItfImpl;// Interfaces implemented by this pass
 
-  Pass *(*NormalCtor)();               // No argument ctor
+  Pass *(*NormalCtor)();
 
 public:
   /// PassInfo ctor - Do not call this directly, this should only be invoked
   /// through RegisterPass.
-  PassInfo(const char *name, const char *arg, const std::type_info &ti,
+  PassInfo(const char *name, const char *arg, intptr_t pi,
            Pass *(*normal)() = 0, bool isCFGOnly = false)
-    : PassName(name), PassArgument(arg), TypeInfo(ti), 
+    : PassName(name), PassArgument(arg), PassID(pi), 
       IsCFGOnlyPass(isCFGOnly), IsAnalysisGroup(false), NormalCtor(normal) {
   }
 
@@ -65,8 +65,8 @@
   const char *getPassArgument() const { return PassArgument; }
 
   /// getTypeInfo - Return the type_info object for the pass...
-  ///
-  const std::type_info &getTypeInfo() const { return TypeInfo; }
+  /// TODO : Rename
+  intptr_t getTypeInfo() const { return PassID; }
 
   /// isAnalysisGroup - Return true if this is an analysis group, not a normal
   /// pass.
@@ -139,12 +139,12 @@
 
   typedef Pass* (*NormalCtor_t)();
   
-  RegisterPassBase(const char *Name, const char *Arg, const std::type_info &TI,
+  RegisterPassBase(const char *Name, const char *Arg, intptr_t TI,
                    NormalCtor_t NormalCtor = 0, bool CFGOnly = false)
     : PIObj(Name, Arg, TI, NormalCtor, CFGOnly) {
     registerPass();
   }
-  RegisterPassBase(const std::type_info &TI)
+  RegisterPassBase(intptr_t TI)
     : PIObj("", "", TI) {
     // This ctor may only be used for analysis groups: it does not auto-register
     // the pass.
@@ -165,7 +165,7 @@
 
   // Register Pass using default constructor...
   RegisterPass(const char *PassArg, const char *Name, bool CFGOnly = false)
-  : RegisterPassBase(Name, PassArg, typeid(PassName),
+    : RegisterPassBase(Name, PassArg, (intptr_t)&PassName::ID,
                      (RegisterPassBase::NormalCtor_t)callDefaultCtor, CFGOnly) {
   }
 };
@@ -195,8 +195,8 @@
   const PassInfo *ImplementationInfo;
   bool isDefaultImplementation;
 protected:
-  explicit RegisterAGBase(const std::type_info &Interface,
-                          const std::type_info *Pass = 0,
+  explicit RegisterAGBase(intptr_t InterfaceID,
+                          intptr_t PassID = 0,
                           bool isDefault = false);
   void setGroupName(const char *Name);
 };
@@ -204,12 +204,12 @@
 template
 struct RegisterAnalysisGroup : public RegisterAGBase {
   explicit RegisterAnalysisGroup(RegisterPassBase &RPB)
-    : RegisterAGBase(typeid(Interface), &RPB.getPassInfo()->getTypeInfo(), 
+    : RegisterAGBase((intptr_t) &Interface::ID, RPB.getPassInfo()->getTypeInfo(),
                      Default) {
   }
 
   explicit RegisterAnalysisGroup(const char *Name)
-  : RegisterAGBase(typeid(Interface)) {
+    : RegisterAGBase((intptr_t) &Interface::ID) {
     setGroupName(Name);
   }
 };





From dpatel at apple.com  Tue May  1 16:17:58 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 1 May 2007 16:17:58 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Assembly/PrintModulePass.h
Message-ID: <200705012117.l41LHw7C031647@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Assembly:

PrintModulePass.h updated: 1.21 -> 1.22
---
Log message:

Do not use typeinfo to identify pass in pass manager.


---
Diffs of the changes:  (+7 -4)

 PrintModulePass.h |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)


Index: llvm/include/llvm/Assembly/PrintModulePass.h
diff -u llvm/include/llvm/Assembly/PrintModulePass.h:1.21 llvm/include/llvm/Assembly/PrintModulePass.h:1.22
--- llvm/include/llvm/Assembly/PrintModulePass.h:1.21	Wed Dec  6 19:30:30 2006
+++ llvm/include/llvm/Assembly/PrintModulePass.h	Tue May  1 16:15:46 2007
@@ -28,9 +28,10 @@
   OStream *Out;           // ostream to print on
   bool DeleteStream;      // Delete the ostream in our dtor?
 public:
-  PrintModulePass() : Out(&cerr), DeleteStream(false) {}
+  static const int ID;
+  PrintModulePass() : ModulePass((intptr_t)&ID), Out(&cerr), DeleteStream(false) {}
   PrintModulePass(OStream *o, bool DS = false)
-    : Out(o), DeleteStream(DS) {}
+    : ModulePass((intptr_t)&ID), Out(o), DeleteStream(DS) {}
 
   ~PrintModulePass() {
     if (DeleteStream) delete Out;
@@ -51,10 +52,12 @@
   OStream *Out;           // ostream to print on
   bool DeleteStream;      // Delete the ostream in our dtor?
 public:
-  PrintFunctionPass() : Banner(""), Out(&cerr), DeleteStream(false) {}
+  static const int ID;
+  PrintFunctionPass() : FunctionPass((intptr_t)&ID), Banner(""), Out(&cerr), 
+                        DeleteStream(false) {}
   PrintFunctionPass(const std::string &B, OStream *o = &cout,
                     bool DS = false)
-    : Banner(B), Out(o), DeleteStream(DS) {}
+    : FunctionPass((intptr_t)&ID), Banner(B), Out(o), DeleteStream(DS) {}
 
   inline ~PrintFunctionPass() {
     if (DeleteStream) delete Out;





From dpatel at apple.com  Tue May  1 16:17:59 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 1 May 2007 16:17:59 -0500
Subject: [llvm-commits] CVS: llvm/tools/opt/AnalysisWrappers.cpp
	GraphPrinters.cpp PrintSCC.cpp opt.cpp
Message-ID: <200705012117.l41LHxAT031662@zion.cs.uiuc.edu>



Changes in directory llvm/tools/opt:

AnalysisWrappers.cpp updated: 1.21 -> 1.22
GraphPrinters.cpp updated: 1.14 -> 1.15
PrintSCC.cpp updated: 1.15 -> 1.16
opt.cpp updated: 1.134 -> 1.135
---
Log message:

Do not use typeinfo to identify pass in pass manager.


---
Diffs of the changes:  (+31 -4)

 AnalysisWrappers.cpp |    7 +++++++
 GraphPrinters.cpp    |    4 ++++
 PrintSCC.cpp         |    7 +++++++
 opt.cpp              |   17 +++++++++++++----
 4 files changed, 31 insertions(+), 4 deletions(-)


Index: llvm/tools/opt/AnalysisWrappers.cpp
diff -u llvm/tools/opt/AnalysisWrappers.cpp:1.21 llvm/tools/opt/AnalysisWrappers.cpp:1.22
--- llvm/tools/opt/AnalysisWrappers.cpp:1.21	Tue Jan 30 14:08:39 2007
+++ llvm/tools/opt/AnalysisWrappers.cpp	Tue May  1 16:15:47 2007
@@ -30,6 +30,8 @@
   /// useful when looking for standard library functions we should constant fold
   /// or handle in alias analyses.
   struct ExternalFunctionsPassedConstants : public ModulePass {
+    static const int ID; // Pass ID, replacement for typeid
+    ExternalFunctionsPassedConstants() : ModulePass((intptr_t)&ID) {}
     virtual bool runOnModule(Module &M) {
       for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I)
         if (I->isDeclaration()) {
@@ -61,10 +63,14 @@
     }
   };
 
+  const int ExternalFunctionsPassedConstants::ID = 0;
   RegisterPass
   P1("externalfnconstants", "Print external fn callsites passed constants");
   
   struct CallGraphPrinter : public ModulePass {
+    static const int ID; // Pass ID, replacement for typeid
+    CallGraphPrinter() : ModulePass((intptr_t)&ID) {}
+
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
       AU.setPreservesAll();
       AU.addRequiredTransitive();
@@ -76,6 +82,7 @@
     }
   };
   
+  const int CallGraphPrinter::ID = 0;
   RegisterPass
     P2("callgraph", "Print a call graph");
 }


Index: llvm/tools/opt/GraphPrinters.cpp
diff -u llvm/tools/opt/GraphPrinters.cpp:1.14 llvm/tools/opt/GraphPrinters.cpp:1.15
--- llvm/tools/opt/GraphPrinters.cpp:1.14	Fri Nov 17 04:05:07 2006
+++ llvm/tools/opt/GraphPrinters.cpp	Tue May  1 16:15:47 2007
@@ -60,6 +60,9 @@
 
 namespace {
   struct CallGraphPrinter : public ModulePass {
+    static const int ID; // Pass ID, replacement for typeid
+    CallGraphPrinter() : ModulePass((intptr_t)&ID) {}
+
     virtual bool runOnModule(Module &M) {
       WriteGraphToFile(std::cerr, "callgraph", &getAnalysis());
       return false;
@@ -74,6 +77,7 @@
     }
   };
 
+  const int CallGraphPrinter::ID = 0;
   RegisterPass P2("print-callgraph",
                                     "Print Call Graph to 'dot' file");
 }


Index: llvm/tools/opt/PrintSCC.cpp
diff -u llvm/tools/opt/PrintSCC.cpp:1.15 llvm/tools/opt/PrintSCC.cpp:1.16
--- llvm/tools/opt/PrintSCC.cpp:1.15	Sun Aug 27 17:30:17 2006
+++ llvm/tools/opt/PrintSCC.cpp	Tue May  1 16:15:47 2007
@@ -35,6 +35,8 @@
 
 namespace {
   struct CFGSCC : public FunctionPass {
+    static const int ID;  // Pass identification, replacement for typeid
+    CFGSCC() : FunctionPass((intptr_t)&ID) {}
     bool runOnFunction(Function& func);
 
     void print(std::ostream &O, const Module* = 0) const { }
@@ -45,6 +47,9 @@
   };
 
   struct CallGraphSCC : public ModulePass {
+    static const int ID;  // Pass identification, replacement for typeid
+    CallGraphSCC() : ModulePass((intptr_t)&ID) {}
+
     // run - Print out SCCs in the call graph for the specified module.
     bool runOnModule(Module &M);
 
@@ -57,9 +62,11 @@
     }
   };
 
+  const int CFGSCC::ID = 0;
   RegisterPass
   Y("cfgscc", "Print SCCs of each function CFG");
 
+  const int CallGraphSCC::ID = 0;
   RegisterPass
   Z("callscc", "Print SCCs of the Call Graph");
 }


Index: llvm/tools/opt/opt.cpp
diff -u llvm/tools/opt/opt.cpp:1.134 llvm/tools/opt/opt.cpp:1.135
--- llvm/tools/opt/opt.cpp:1.134	Thu Apr 19 23:45:58 2007
+++ llvm/tools/opt/opt.cpp	Tue May  1 16:15:47 2007
@@ -98,8 +98,10 @@
 namespace {
 
 struct ModulePassPrinter : public ModulePass {
+  static const int ID;
   const PassInfo *PassToPrint;
-  ModulePassPrinter(const PassInfo *PI) : PassToPrint(PI) {}
+  ModulePassPrinter(const PassInfo *PI) : ModulePass((intptr_t)&ID),
+                                          PassToPrint(PI) {}
 
   virtual bool runOnModule(Module &M) {
     if (!Quiet) {
@@ -119,12 +121,15 @@
   }
 };
 
+const int ModulePassPrinter::ID = 0;
 struct FunctionPassPrinter : public FunctionPass {
   const PassInfo *PassToPrint;
-  FunctionPassPrinter(const PassInfo *PI) : PassToPrint(PI) {}
+  static const int ID;
+  FunctionPassPrinter(const PassInfo *PI) : FunctionPass((intptr_t)&ID),
+                                            PassToPrint(PI) {}
 
   virtual bool runOnFunction(Function &F) {
-    if (!Quiet) {
+    if (!Quiet) { 
       cout << "Printing analysis '" << PassToPrint->getPassName()
            << "' for function '" << F.getName() << "':\n";
     }
@@ -141,9 +146,12 @@
   }
 };
 
+const int FunctionPassPrinter::ID = 0;
 struct BasicBlockPassPrinter : public BasicBlockPass {
   const PassInfo *PassToPrint;
-  BasicBlockPassPrinter(const PassInfo *PI) : PassToPrint(PI) {}
+  static const int ID;
+  BasicBlockPassPrinter(const PassInfo *PI) 
+    : BasicBlockPass((intptr_t)&ID), PassToPrint(PI) {}
 
   virtual bool runOnBasicBlock(BasicBlock &BB) {
     if (!Quiet) {
@@ -164,6 +172,7 @@
   }
 };
 
+const int BasicBlockPassPrinter::ID = 0;
 inline void addPass(PassManager &PM, Pass *P) {
   // Add the pass to the pass manager...
   PM.add(P);





From dpatel at apple.com  Tue May  1 16:18:00 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 1 May 2007 16:18:00 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Hello/Hello.cpp
Message-ID: <200705012118.l41LI0n0031667@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Hello:

Hello.cpp updated: 1.14 -> 1.15
---
Log message:

Do not use typeinfo to identify pass in pass manager.


---
Diffs of the changes:  (+9 -0)

 Hello.cpp |    9 +++++++++
 1 files changed, 9 insertions(+)


Index: llvm/lib/Transforms/Hello/Hello.cpp
diff -u llvm/lib/Transforms/Hello/Hello.cpp:1.14 llvm/lib/Transforms/Hello/Hello.cpp:1.15
--- llvm/lib/Transforms/Hello/Hello.cpp:1.14	Fri Apr 13 13:58:18 2007
+++ llvm/lib/Transforms/Hello/Hello.cpp	Tue May  1 16:15:46 2007
@@ -25,6 +25,9 @@
 namespace {
   // Hello - The first implementation, without getAnalysisUsage.
   struct Hello : public FunctionPass {
+    static const int ID; // Pass identifcation, replacement for typeid
+    Hello() : FunctionPass((intptr_t)&ID) {}
+
     virtual bool runOnFunction(Function &F) {
       HelloCounter++;
       std::string fname = F.getName();
@@ -33,10 +36,15 @@
       return false;
     }
   };
+
+  const int Hello::ID = 0;
   RegisterPass X("hello", "Hello World Pass");
 
   // Hello2 - The second implementation with getAnalysisUsage implemented.
   struct Hello2 : public FunctionPass {
+    static const int ID; // Pass identifcation, replacement for typeid
+    Hello2() : FunctionPass((intptr_t)&ID) {}
+
     virtual bool runOnFunction(Function &F) {
       HelloCounter++;
       std::string fname = F.getName();
@@ -50,6 +58,7 @@
       AU.setPreservesAll();
     };
   };
+  const int Hello2::ID = 0;
   RegisterPass Y("hello2",
                         "Hello World Pass (with getAnalysisUsage implemented)");
 }





From dpatel at apple.com  Tue May  1 16:18:00 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 1 May 2007 16:18:00 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Bytecode/WriteBytecodePass.h
Message-ID: <200705012118.l41LI0fs031673@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Bytecode:

WriteBytecodePass.h updated: 1.19 -> 1.20
---
Log message:

Do not use typeinfo to identify pass in pass manager.


---
Diffs of the changes:  (+4 -2)

 WriteBytecodePass.h |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


Index: llvm/include/llvm/Bytecode/WriteBytecodePass.h
diff -u llvm/include/llvm/Bytecode/WriteBytecodePass.h:1.19 llvm/include/llvm/Bytecode/WriteBytecodePass.h:1.20
--- llvm/include/llvm/Bytecode/WriteBytecodePass.h:1.19	Sun Jan 21 00:31:34 2007
+++ llvm/include/llvm/Bytecode/WriteBytecodePass.h	Tue May  1 16:15:46 2007
@@ -26,10 +26,12 @@
   bool DeleteStream;
   bool CompressFile;
 public:
+  static const int ID; // Pass identifcation, replacement for typeid
   WriteBytecodePass()
-    : Out(&cout), DeleteStream(false), CompressFile(false) {}
+    : ModulePass((intptr_t) &ID), Out(&cout), DeleteStream(false), 
+      CompressFile(false) {}
   WriteBytecodePass(OStream *o, bool DS = false, bool CF = false)
-    : Out(o), DeleteStream(DS), CompressFile(CF) {}
+    : ModulePass((intptr_t) &ID), Out(o), DeleteStream(DS), CompressFile(CF) {}
 
   inline ~WriteBytecodePass() {
     if (DeleteStream) delete Out;





From dpatel at apple.com  Tue May  1 16:18:01 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 1 May 2007 16:18:01 -0500
Subject: [llvm-commits] CVS: llvm/tools/bugpoint/ExtractFunction.cpp
	TestPasses.cpp
Message-ID: <200705012118.l41LI16n031720@zion.cs.uiuc.edu>



Changes in directory llvm/tools/bugpoint:

ExtractFunction.cpp updated: 1.58 -> 1.59
TestPasses.cpp updated: 1.10 -> 1.11
---
Log message:

Do not use typeinfo to identify pass in pass manager.


---
Diffs of the changes:  (+15 -1)

 ExtractFunction.cpp |    4 ++++
 TestPasses.cpp      |   12 +++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)


Index: llvm/tools/bugpoint/ExtractFunction.cpp
diff -u llvm/tools/bugpoint/ExtractFunction.cpp:1.58 llvm/tools/bugpoint/ExtractFunction.cpp:1.59
--- llvm/tools/bugpoint/ExtractFunction.cpp:1.58	Mon Feb  5 14:47:21 2007
+++ llvm/tools/bugpoint/ExtractFunction.cpp	Tue May  1 16:15:47 2007
@@ -305,7 +305,11 @@
   /// BlocksToNotExtract list.
   class BlockExtractorPass : public ModulePass {
     bool runOnModule(Module &M);
+  public:
+    static const int ID; // Pass ID, replacement for typeid
+    BlockExtractorPass() : ModulePass((intptr_t)&ID) {}
   };
+  const int BlockExtractorPass::ID = 0;
   RegisterPass
   XX("extract-bbs", "Extract Basic Blocks From Module (for bugpoint use)");
 }


Index: llvm/tools/bugpoint/TestPasses.cpp
diff -u llvm/tools/bugpoint/TestPasses.cpp:1.10 llvm/tools/bugpoint/TestPasses.cpp:1.11
--- llvm/tools/bugpoint/TestPasses.cpp:1.10	Thu Apr 21 18:59:23 2005
+++ llvm/tools/bugpoint/TestPasses.cpp	Tue May  1 16:15:47 2007
@@ -25,6 +25,10 @@
   /// CrashOnCalls - This pass is used to test bugpoint.  It intentionally
   /// crashes on any call instructions.
   class CrashOnCalls : public BasicBlockPass {
+  public:
+    static const int ID; // Pass ID, replacement for typeid
+    CrashOnCalls() : BasicBlockPass((intptr_t)&ID) {}
+  private:
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
       AU.setPreservesAll();
     }
@@ -38,6 +42,7 @@
     }
   };
 
+  const int CrashOnCalls::ID = 0;
   RegisterPass
   X("bugpoint-crashcalls",
     "BugPoint Test Pass - Intentionally crash on CallInsts");
@@ -47,6 +52,10 @@
   /// DeleteCalls - This pass is used to test bugpoint.  It intentionally
   /// deletes some call instructions, "misoptimizing" the program.
   class DeleteCalls : public BasicBlockPass {
+  public:
+    static const int ID; // Pass ID, replacement for typeid
+    DeleteCalls() : BasicBlockPass((intptr_t)&ID) {}
+  private:
     bool runOnBasicBlock(BasicBlock &BB) {
       for (BasicBlock::iterator I = BB.begin(), E = BB.end(); I != E; ++I)
         if (CallInst *CI = dyn_cast(I)) {
@@ -58,7 +67,8 @@
       return false;
     }
   };
-
+ 
+  const int DeleteCalls::ID = 0;
   RegisterPass
   Y("bugpoint-deletecalls",
     "BugPoint Test Pass - Intentionally 'misoptimize' CallInsts");





From dpatel at apple.com  Tue May  1 16:18:00 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 1 May 2007 16:18:00 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/CodeGen/AsmPrinter.h
	LiveIntervalAnalysis.h LiveVariables.h MachineFunctionPass.h
	MachineModuleInfo.h SelectionDAGISel.h
Message-ID: <200705012118.l41LI0rc031685@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/CodeGen:

AsmPrinter.h updated: 1.63 -> 1.64
LiveIntervalAnalysis.h updated: 1.80 -> 1.81
LiveVariables.h updated: 1.41 -> 1.42
MachineFunctionPass.h updated: 1.5 -> 1.6
MachineModuleInfo.h updated: 1.7 -> 1.8
SelectionDAGISel.h updated: 1.37 -> 1.38
---
Log message:

Do not use typeinfo to identify pass in pass manager.


---
Diffs of the changes:  (+15 -1)

 AsmPrinter.h           |    2 ++
 LiveIntervalAnalysis.h |    3 +++
 LiveVariables.h        |    3 +++
 MachineFunctionPass.h  |    2 ++
 MachineModuleInfo.h    |    2 ++
 SelectionDAGISel.h     |    4 +++-
 6 files changed, 15 insertions(+), 1 deletion(-)


Index: llvm/include/llvm/CodeGen/AsmPrinter.h
diff -u llvm/include/llvm/CodeGen/AsmPrinter.h:1.63 llvm/include/llvm/CodeGen/AsmPrinter.h:1.64
--- llvm/include/llvm/CodeGen/AsmPrinter.h:1.63	Wed Apr 25 09:27:10 2007
+++ llvm/include/llvm/CodeGen/AsmPrinter.h	Tue May  1 16:15:46 2007
@@ -34,6 +34,8 @@
   /// AsmPrinter - This class is intended to be used as a driving class for all
   /// asm writers.
   class AsmPrinter : public MachineFunctionPass {
+    static const int ID;
+
     /// FunctionNumber - This provides a unique ID for each function emitted in
     /// this translation unit.  It is autoincremented by SetupMachineFunction,
     /// and can be accessed with getFunctionNumber() and 


Index: llvm/include/llvm/CodeGen/LiveIntervalAnalysis.h
diff -u llvm/include/llvm/CodeGen/LiveIntervalAnalysis.h:1.80 llvm/include/llvm/CodeGen/LiveIntervalAnalysis.h:1.81
--- llvm/include/llvm/CodeGen/LiveIntervalAnalysis.h:1.80	Wed Apr 25 02:30:23 2007
+++ llvm/include/llvm/CodeGen/LiveIntervalAnalysis.h	Tue May  1 16:15:46 2007
@@ -65,6 +65,9 @@
     BitVector JoinedLIs;
 
   public:
+    static const int ID; // Pass identifcation, replacement for typeid
+    LiveIntervals() : MachineFunctionPass((intptr_t)&ID) {}
+
     struct CopyRec {
       MachineInstr *MI;
       unsigned SrcReg, DstReg;


Index: llvm/include/llvm/CodeGen/LiveVariables.h
diff -u llvm/include/llvm/CodeGen/LiveVariables.h:1.41 llvm/include/llvm/CodeGen/LiveVariables.h:1.42
--- llvm/include/llvm/CodeGen/LiveVariables.h:1.41	Wed Apr 25 20:40:09 2007
+++ llvm/include/llvm/CodeGen/LiveVariables.h	Tue May  1 16:15:46 2007
@@ -40,6 +40,9 @@
 
 class LiveVariables : public MachineFunctionPass {
 public:
+  static const int ID; // Pass identifcation, replacement for typeid
+  LiveVariables() : MachineFunctionPass((intptr_t)&ID) {}
+
   /// VarInfo - This represents the regions where a virtual register is live in
   /// the program.  We represent this with three different pieces of
   /// information: the instruction that uniquely defines the value, the set of


Index: llvm/include/llvm/CodeGen/MachineFunctionPass.h
diff -u llvm/include/llvm/CodeGen/MachineFunctionPass.h:1.5 llvm/include/llvm/CodeGen/MachineFunctionPass.h:1.6
--- llvm/include/llvm/CodeGen/MachineFunctionPass.h:1.5	Fri Jul 14 18:08:47 2006
+++ llvm/include/llvm/CodeGen/MachineFunctionPass.h	Tue May  1 16:15:46 2007
@@ -26,6 +26,8 @@
 
 struct MachineFunctionPass : public FunctionPass {
 
+  MachineFunctionPass(intptr_t ID) : FunctionPass(ID) {}
+
   /// runOnMachineFunction - This method must be overloaded to perform the
   /// desired machine code transformation or analysis.
   ///


Index: llvm/include/llvm/CodeGen/MachineModuleInfo.h
diff -u llvm/include/llvm/CodeGen/MachineModuleInfo.h:1.7 llvm/include/llvm/CodeGen/MachineModuleInfo.h:1.8
--- llvm/include/llvm/CodeGen/MachineModuleInfo.h:1.7	Thu Mar  1 14:25:32 2007
+++ llvm/include/llvm/CodeGen/MachineModuleInfo.h	Tue May  1 16:15:46 2007
@@ -1022,6 +1022,8 @@
   std::vector TypeInfos;
 
 public:
+  static const int ID; // Pass identifcation, replacement for typeid
+
   MachineModuleInfo();
   ~MachineModuleInfo();
   


Index: llvm/include/llvm/CodeGen/SelectionDAGISel.h
diff -u llvm/include/llvm/CodeGen/SelectionDAGISel.h:1.37 llvm/include/llvm/CodeGen/SelectionDAGISel.h:1.38
--- llvm/include/llvm/CodeGen/SelectionDAGISel.h:1.37	Mon Apr  9 07:31:58 2007
+++ llvm/include/llvm/CodeGen/SelectionDAGISel.h	Tue May  1 16:15:46 2007
@@ -41,8 +41,10 @@
   MachineBasicBlock *BB;
   std::vector TopOrder;
   unsigned DAGSize;
+  static const int ID;
 
-  explicit SelectionDAGISel(TargetLowering &tli) : TLI(tli), DAGSize(0) {}
+  explicit SelectionDAGISel(TargetLowering &tli) : 
+    FunctionPass((intptr_t)&ID), TLI(tli), DAGSize(0) {}
   
   TargetLowering &getTargetLowering() { return TLI; }
 





From dpatel at apple.com  Tue May  1 16:18:01 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 1 May 2007 16:18:01 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Transforms/RSProfiling.h
Message-ID: <200705012118.l41LI1rd031695@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Transforms:

RSProfiling.h updated: 1.2 -> 1.3
---
Log message:

Do not use typeinfo to identify pass in pass manager.


---
Diffs of the changes:  (+3 -0)

 RSProfiling.h |    3 +++
 1 files changed, 3 insertions(+)


Index: llvm/include/llvm/Transforms/RSProfiling.h
diff -u llvm/include/llvm/Transforms/RSProfiling.h:1.2 llvm/include/llvm/Transforms/RSProfiling.h:1.3
--- llvm/include/llvm/Transforms/RSProfiling.h:1.2	Wed Feb 22 10:23:43 2006
+++ llvm/include/llvm/Transforms/RSProfiling.h	Tue May  1 16:15:46 2007
@@ -23,6 +23,9 @@
   /// this interface are expected to chain to other implementations, such that
   /// multiple profilers can be support simultaniously.
   struct RSProfilers : public ModulePass {
+    static const int ID; // Pass identification, replacement for typeinfo
+    RSProfilers() : ModulePass((intptr_t)&ID) {}
+
     /// isProfiling - This method returns true if the value passed it was 
     /// inserted by the profiler.
     virtual bool isProfiling(Value* v) = 0;





From dpatel at apple.com  Tue May  1 16:18:01 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 1 May 2007 16:18:01 -0500
Subject: [llvm-commits] CVS: llvm/lib/Analysis/IPA/Andersens.cpp
	CallGraph.cpp CallGraphSCCPass.cpp FindUsedTypes.cpp
	GlobalsModRef.cpp
Message-ID: <200705012118.l41LI1xa031711@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Analysis/IPA:

Andersens.cpp updated: 1.46 -> 1.47
CallGraph.cpp updated: 1.65 -> 1.66
CallGraphSCCPass.cpp updated: 1.21 -> 1.22
FindUsedTypes.cpp updated: 1.38 -> 1.39
GlobalsModRef.cpp updated: 1.29 -> 1.30
---
Log message:

Do not use typeinfo to identify pass in pass manager.


---
Diffs of the changes:  (+20 -2)

 Andersens.cpp        |    6 ++++++
 CallGraph.cpp        |    6 +++++-
 CallGraphSCCPass.cpp |    5 ++++-
 FindUsedTypes.cpp    |    1 +
 GlobalsModRef.cpp    |    4 ++++
 5 files changed, 20 insertions(+), 2 deletions(-)


Index: llvm/lib/Analysis/IPA/Andersens.cpp
diff -u llvm/lib/Analysis/IPA/Andersens.cpp:1.46 llvm/lib/Analysis/IPA/Andersens.cpp:1.47
--- llvm/lib/Analysis/IPA/Andersens.cpp:1.46	Sun Mar  4 18:00:42 2007
+++ llvm/lib/Analysis/IPA/Andersens.cpp	Tue May  1 16:15:46 2007
@@ -75,12 +75,17 @@
 namespace {
   class VISIBILITY_HIDDEN Andersens : public ModulePass, public AliasAnalysis,
                                       private InstVisitor {
+  public:
+    static const int 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
     /// program, and is the primitive used to build the points-to graph.
     class Node {
       std::vector Pointees;
       Value *Val;
     public:
+      static const unsigned ID; // Pass identifcation, replacement for typeid
       Node() : Val(0) {}
       Node *setValue(Value *V) {
         assert(Val == 0 && "Value already set for this node!");
@@ -334,6 +339,7 @@
     void visitInstruction(Instruction &I);
   };
 
+  const int Andersens::ID = 0;
   RegisterPass X("anders-aa",
                             "Andersen's Interprocedural Alias Analysis");
   RegisterAnalysisGroup Y(X);


Index: llvm/lib/Analysis/IPA/CallGraph.cpp
diff -u llvm/lib/Analysis/IPA/CallGraph.cpp:1.65 llvm/lib/Analysis/IPA/CallGraph.cpp:1.66
--- llvm/lib/Analysis/IPA/CallGraph.cpp:1.65	Mon Feb  5 17:42:17 2007
+++ llvm/lib/Analysis/IPA/CallGraph.cpp	Tue May  1 16:15:46 2007
@@ -51,7 +51,9 @@
   CallGraphNode *CallsExternalNode;
 
 public:
-  BasicCallGraph() : Root(0), ExternalCallingNode(0), CallsExternalNode(0) {}
+  static const int ID; // Class identification, replacement for typeinfo
+  BasicCallGraph() : ModulePass((intptr_t)&ID), Root(0), 
+    ExternalCallingNode(0), CallsExternalNode(0) {}
 
   // runOnModule - Compute the call graph for the specified module.
   virtual bool runOnModule(Module &M) {
@@ -188,7 +190,9 @@
   }
 };
 
+const int CallGraph::ID = 0;
 RegisterAnalysisGroup X("Call Graph");
+const int BasicCallGraph::ID = 0;
 RegisterPass Y("basiccg", "Basic CallGraph Construction");
 RegisterAnalysisGroup Z(Y);
 


Index: llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp
diff -u llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp:1.21 llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp:1.22
--- llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp:1.21	Mon Apr 16 13:10:22 2007
+++ llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp	Tue May  1 16:15:46 2007
@@ -30,7 +30,9 @@
 class CGPassManager : public ModulePass, public PMDataManager {
 
 public:
-  CGPassManager(int Depth) : PMDataManager(Depth) { }
+  static const int ID;
+  CGPassManager(int Depth) 
+    : ModulePass((intptr_t)&ID), PMDataManager(Depth) { }
 
   /// 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.
@@ -71,6 +73,7 @@
   }
 };
 
+const int 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.38 llvm/lib/Analysis/IPA/FindUsedTypes.cpp:1.39
--- llvm/lib/Analysis/IPA/FindUsedTypes.cpp:1.38	Wed Dec  6 00:35:25 2006
+++ llvm/lib/Analysis/IPA/FindUsedTypes.cpp	Tue May  1 16:15:46 2007
@@ -21,6 +21,7 @@
 #include "llvm/Support/InstIterator.h"
 using namespace llvm;
 
+const int FindUsedTypes::ID = 0;
 static RegisterPass
 X("printusedtypes", "Find Used Types");
 


Index: llvm/lib/Analysis/IPA/GlobalsModRef.cpp
diff -u llvm/lib/Analysis/IPA/GlobalsModRef.cpp:1.29 llvm/lib/Analysis/IPA/GlobalsModRef.cpp:1.30
--- llvm/lib/Analysis/IPA/GlobalsModRef.cpp:1.29	Mon Feb  5 17:42:17 2007
+++ llvm/lib/Analysis/IPA/GlobalsModRef.cpp	Tue May  1 16:15:46 2007
@@ -83,6 +83,9 @@
     std::map FunctionInfo;
 
   public:
+    static const int ID;
+    GlobalsModRef() : ModulePass((intptr_t)&ID) {}
+
     bool runOnModule(Module &M) {
       InitializeAliasAnalysis(this);                 // set up super class
       AnalyzeGlobals(M);                          // find non-addr taken globals
@@ -143,6 +146,7 @@
     bool AnalyzeIndirectGlobalMemory(GlobalValue *GV);
   };
 
+  const int GlobalsModRef::ID = 0;
   RegisterPass X("globalsmodref-aa",
                                 "Simple mod/ref analysis for globals");
   RegisterAnalysisGroup Y(X);





From dpatel at apple.com  Tue May  1 16:18:01 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 1 May 2007 16:18:01 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Target/TargetData.h
Message-ID: <200705012118.l41LI1w2031692@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Target:

TargetData.h updated: 1.60 -> 1.61
---
Log message:

Do not use typeinfo to identify pass in pass manager.


---
Diffs of the changes:  (+6 -3)

 TargetData.h |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)


Index: llvm/include/llvm/Target/TargetData.h
diff -u llvm/include/llvm/Target/TargetData.h:1.60 llvm/include/llvm/Target/TargetData.h:1.61
--- llvm/include/llvm/Target/TargetData.h:1.60	Thu Apr 26 14:39:32 2007
+++ llvm/include/llvm/Target/TargetData.h	Tue May  1 16:15:46 2007
@@ -108,14 +108,15 @@
   ///
   /// @note This has to exist, because this is a pass, but it should never be
   /// used.
-  TargetData() {
+  TargetData() : ImmutablePass((intptr_t)&ID) {
     assert(0 && "ERROR: Bad TargetData ctor used.  "
            "Tool did not specify a TargetData to use?");
     abort();
   }
     
   /// Constructs a TargetData from a specification string. See init().
-  TargetData(const std::string &TargetDescription) {
+  TargetData(const std::string &TargetDescription) 
+    : ImmutablePass((intptr_t)&ID) {
     init(TargetDescription);
   }
 
@@ -123,7 +124,7 @@
   TargetData(const Module *M);
 
   TargetData(const TargetData &TD) : 
-    ImmutablePass(),
+    ImmutablePass((intptr_t)&ID),
     LittleEndian(TD.isLittleEndian()),
     PointerMemSize(TD.PointerMemSize),
     PointerABIAlign(TD.PointerABIAlign),
@@ -200,6 +201,8 @@
   /// specified global, returned in log form.  This includes an explicitly
   /// requested alignment (if the global has one).
   unsigned getPreferredAlignmentLog(const GlobalVariable *GV) const;
+
+  static const int ID; // Pass identifcation, replacement for typeid
 };
 
 /// StructLayout - used to lazily calculate structure layout information for a





From dpatel at apple.com  Tue May  1 16:18:01 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 1 May 2007 16:18:01 -0500
Subject: [llvm-commits] CVS: llvm/lib/Analysis/AliasAnalysis.cpp
	AliasAnalysisCounter.cpp AliasAnalysisEvaluator.cpp
	AliasDebugger.cpp AliasSetTracker.cpp BasicAliasAnalysis.cpp
	CFGPrinter.cpp InstCount.cpp IntervalPartition.cpp
	LoadValueNumbering.cpp LoopInfo.cpp LoopPass.cpp
	PostDominators.cpp ProfileInfo.cpp ProfileInfoLoaderPass.cpp
	ScalarEvolution.cpp ValueNumbering.cpp
Message-ID: <200705012118.l41LI1ks031754@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Analysis:

AliasAnalysis.cpp updated: 1.30 -> 1.31
AliasAnalysisCounter.cpp updated: 1.20 -> 1.21
AliasAnalysisEvaluator.cpp updated: 1.33 -> 1.34
AliasDebugger.cpp updated: 1.3 -> 1.4
AliasSetTracker.cpp updated: 1.46 -> 1.47
BasicAliasAnalysis.cpp updated: 1.108 -> 1.109
CFGPrinter.cpp updated: 1.22 -> 1.23
InstCount.cpp updated: 1.20 -> 1.21
IntervalPartition.cpp updated: 1.32 -> 1.33
LoadValueNumbering.cpp updated: 1.39 -> 1.40
LoopInfo.cpp updated: 1.83 -> 1.84
LoopPass.cpp updated: 1.18 -> 1.19
PostDominators.cpp updated: 1.67 -> 1.68
ProfileInfo.cpp updated: 1.11 -> 1.12
ProfileInfoLoaderPass.cpp updated: 1.18 -> 1.19
ScalarEvolution.cpp updated: 1.112 -> 1.113
ValueNumbering.cpp updated: 1.25 -> 1.26
---
Log message:

Do not use typeinfo to identify pass in pass manager.


---
Diffs of the changes:  (+61 -5)

 AliasAnalysis.cpp          |    1 +
 AliasAnalysisCounter.cpp   |    4 +++-
 AliasAnalysisEvaluator.cpp |    4 ++++
 AliasDebugger.cpp          |    4 ++++
 AliasSetTracker.cpp        |    4 ++++
 BasicAliasAnalysis.cpp     |    6 ++++++
 CFGPrinter.cpp             |    6 ++++++
 InstCount.cpp              |    4 ++++
 IntervalPartition.cpp      |    4 +++-
 LoadValueNumbering.cpp     |    3 +++
 LoopInfo.cpp               |    1 +
 LoopPass.cpp               |    5 ++++-
 PostDominators.cpp         |    3 +++
 ProfileInfo.cpp            |    7 ++++++-
 ProfileInfoLoaderPass.cpp  |    4 +++-
 ScalarEvolution.cpp        |    1 +
 ValueNumbering.cpp         |    5 +++++
 17 files changed, 61 insertions(+), 5 deletions(-)


Index: llvm/lib/Analysis/AliasAnalysis.cpp
diff -u llvm/lib/Analysis/AliasAnalysis.cpp:1.30 llvm/lib/Analysis/AliasAnalysis.cpp:1.31
--- llvm/lib/Analysis/AliasAnalysis.cpp:1.30	Fri Nov 17 01:10:51 2006
+++ llvm/lib/Analysis/AliasAnalysis.cpp	Tue May  1 16:15:46 2007
@@ -34,6 +34,7 @@
 
 // Register the AliasAnalysis interface, providing a nice name to refer to.
 namespace {
+  const int AliasAnalysis::ID = 0;
   RegisterAnalysisGroup Z("Alias Analysis");
 }
 


Index: llvm/lib/Analysis/AliasAnalysisCounter.cpp
diff -u llvm/lib/Analysis/AliasAnalysisCounter.cpp:1.20 llvm/lib/Analysis/AliasAnalysisCounter.cpp:1.21
--- llvm/lib/Analysis/AliasAnalysisCounter.cpp:1.20	Mon Feb  5 17:42:17 2007
+++ llvm/lib/Analysis/AliasAnalysisCounter.cpp	Tue May  1 16:15:46 2007
@@ -34,7 +34,8 @@
     const char *Name;
     Module *M;
   public:
-    AliasAnalysisCounter() {
+    static const int ID; // Class identification, replacement for typeinfo
+    AliasAnalysisCounter() : ModulePass((intptr_t) &ID) {
       No = May = Must = 0;
       NoMR = JustRef = JustMod = MR = 0;
     }
@@ -107,6 +108,7 @@
     }
   };
 
+  const int AliasAnalysisCounter::ID = 0;
   RegisterPass
   X("count-aa", "Count Alias Analysis Query Responses");
   RegisterAnalysisGroup Y(X);


Index: llvm/lib/Analysis/AliasAnalysisEvaluator.cpp
diff -u llvm/lib/Analysis/AliasAnalysisEvaluator.cpp:1.33 llvm/lib/Analysis/AliasAnalysisEvaluator.cpp:1.34
--- llvm/lib/Analysis/AliasAnalysisEvaluator.cpp:1.33	Mon Feb  5 17:42:17 2007
+++ llvm/lib/Analysis/AliasAnalysisEvaluator.cpp	Tue May  1 16:15:46 2007
@@ -50,6 +50,9 @@
     unsigned NoModRef, Mod, Ref, ModRef;
 
   public:
+    static const int ID; // Pass identifcation, replacement for typeid
+    AAEval() : FunctionPass((intptr_t)&ID) {}
+
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
       AU.addRequired();
       AU.setPreservesAll();
@@ -70,6 +73,7 @@
     bool doFinalization(Module &M);
   };
 
+  const int AAEval::ID = 0;
   RegisterPass
   X("aa-eval", "Exhaustive Alias Analysis Precision Evaluator");
 }


Index: llvm/lib/Analysis/AliasDebugger.cpp
diff -u llvm/lib/Analysis/AliasDebugger.cpp:1.3 llvm/lib/Analysis/AliasDebugger.cpp:1.4
--- llvm/lib/Analysis/AliasDebugger.cpp:1.3	Mon Feb  5 17:42:17 2007
+++ llvm/lib/Analysis/AliasDebugger.cpp	Tue May  1 16:15:46 2007
@@ -40,6 +40,9 @@
     std::set Vals;
     
   public:
+    static const int ID; // Class identification, replacement for typeinfo
+    AliasDebugger() : ModulePass((intptr_t)&ID) {}
+
     bool runOnModule(Module &M) {
       InitializeAliasAnalysis(this);                 // set up super class
 
@@ -119,6 +122,7 @@
 
   };
 
+  const int AliasDebugger::ID = 0;
   RegisterPass X("debug-aa", "AA use debugger");
   RegisterAnalysisGroup Y(X);
 }


Index: llvm/lib/Analysis/AliasSetTracker.cpp
diff -u llvm/lib/Analysis/AliasSetTracker.cpp:1.46 llvm/lib/Analysis/AliasSetTracker.cpp:1.47
--- llvm/lib/Analysis/AliasSetTracker.cpp:1.46	Mon Feb  5 17:42:17 2007
+++ llvm/lib/Analysis/AliasSetTracker.cpp	Tue May  1 16:15:46 2007
@@ -555,6 +555,9 @@
   class VISIBILITY_HIDDEN AliasSetPrinter : public FunctionPass {
     AliasSetTracker *Tracker;
   public:
+    static const int ID; // Pass identifcation, replacement for typeid
+    AliasSetPrinter() : FunctionPass((intptr_t)&ID) {}
+
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
       AU.setPreservesAll();
       AU.addRequired();
@@ -570,5 +573,6 @@
       return false;
     }
   };
+  const int AliasSetPrinter::ID = 0;
   RegisterPass X("print-alias-sets", "Alias Set Printer");
 }


Index: llvm/lib/Analysis/BasicAliasAnalysis.cpp
diff -u llvm/lib/Analysis/BasicAliasAnalysis.cpp:1.108 llvm/lib/Analysis/BasicAliasAnalysis.cpp:1.109
--- llvm/lib/Analysis/BasicAliasAnalysis.cpp:1.108	Thu Apr 19 00:39:12 2007
+++ llvm/lib/Analysis/BasicAliasAnalysis.cpp	Tue May  1 16:15:46 2007
@@ -36,6 +36,9 @@
   /// such it doesn't follow many of the rules that other alias analyses must.
   ///
   struct VISIBILITY_HIDDEN NoAA : public ImmutablePass, public AliasAnalysis {
+    static const int ID; // Class identification, replacement for typeinfo
+    NoAA() : ImmutablePass((intptr_t)&ID) {}
+
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
       AU.addRequired();
     }
@@ -74,6 +77,7 @@
   };
 
   // Register this pass...
+  const int NoAA::ID = 0;
   RegisterPass
   U("no-aa", "No Alias Analysis (always returns 'may' alias)");
 
@@ -88,6 +92,7 @@
   /// Because it doesn't chain to a previous alias analysis (like -no-aa), it
   /// derives from the NoAA class.
   struct VISIBILITY_HIDDEN BasicAliasAnalysis : public NoAA {
+    static const int ID; // Class identification, replacement for typeinfo
     AliasResult alias(const Value *V1, unsigned V1Size,
                       const Value *V2, unsigned V2Size);
 
@@ -119,6 +124,7 @@
   };
 
   // Register this pass...
+  const int BasicAliasAnalysis::ID = 0;
   RegisterPass
   X("basicaa", "Basic Alias Analysis (default AA impl)");
 


Index: llvm/lib/Analysis/CFGPrinter.cpp
diff -u llvm/lib/Analysis/CFGPrinter.cpp:1.22 llvm/lib/Analysis/CFGPrinter.cpp:1.23
--- llvm/lib/Analysis/CFGPrinter.cpp:1.22	Mon Feb  5 17:42:17 2007
+++ llvm/lib/Analysis/CFGPrinter.cpp	Tue May  1 16:15:46 2007
@@ -91,6 +91,9 @@
 
 namespace {
   struct VISIBILITY_HIDDEN CFGPrinter : public FunctionPass {
+    static const int ID; // Pass identifcation, replacement for typeid
+    CFGPrinter() : FunctionPass((intptr_t)&ID) {}
+
     virtual bool runOnFunction(Function &F) {
       std::string Filename = "cfg." + F.getName() + ".dot";
       cerr << "Writing '" << Filename << "'...";
@@ -111,10 +114,12 @@
     }
   };
 
+  const int CFGPrinter::ID = 0;
   RegisterPass P1("print-cfg",
                               "Print CFG of function to 'dot' file");
 
   struct VISIBILITY_HIDDEN CFGOnlyPrinter : public CFGPrinter {
+    static const int ID; // Pass identifcation, replacement for typeid
     virtual bool runOnFunction(Function &F) {
       bool OldCFGOnly = CFGOnly;
       CFGOnly = true;
@@ -129,6 +134,7 @@
     }
   };
 
+  const int CFGOnlyPrinter::ID = 0;
   RegisterPass
   P2("print-cfg-only",
      "Print CFG of function to 'dot' file (with no function bodies)");


Index: llvm/lib/Analysis/InstCount.cpp
diff -u llvm/lib/Analysis/InstCount.cpp:1.20 llvm/lib/Analysis/InstCount.cpp:1.21
--- llvm/lib/Analysis/InstCount.cpp:1.20	Mon Feb  5 17:42:17 2007
+++ llvm/lib/Analysis/InstCount.cpp	Tue May  1 16:15:46 2007
@@ -51,6 +51,9 @@
       abort();
     }
   public:
+    static const int ID; // Pass identifcation, replacement for typeid
+    InstCount() : FunctionPass((intptr_t)&ID) {}
+
     virtual bool runOnFunction(Function &F);
 
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
@@ -60,6 +63,7 @@
 
   };
 
+  const int InstCount::ID = 0;
   RegisterPass X("instcount",
                             "Counts the various types of Instructions");
 }


Index: llvm/lib/Analysis/IntervalPartition.cpp
diff -u llvm/lib/Analysis/IntervalPartition.cpp:1.32 llvm/lib/Analysis/IntervalPartition.cpp:1.33
--- llvm/lib/Analysis/IntervalPartition.cpp:1.32	Sun Aug 27 17:30:17 2006
+++ llvm/lib/Analysis/IntervalPartition.cpp	Tue May  1 16:15:46 2007
@@ -15,6 +15,7 @@
 #include "llvm/Analysis/IntervalIterator.h"
 using namespace llvm;
 
+const int IntervalPartition::ID = 0;
 static RegisterPass
 X("intervals", "Interval Partition Construction", true);
 
@@ -88,7 +89,8 @@
 // existing interval graph.  This takes an additional boolean parameter to
 // distinguish it from a copy constructor.  Always pass in false for now.
 //
-IntervalPartition::IntervalPartition(IntervalPartition &IP, bool) {
+IntervalPartition::IntervalPartition(IntervalPartition &IP, bool)
+  : FunctionPass((intptr_t) &ID) {
   Interval *FunctionStart = IP.getRootInterval();
   assert(FunctionStart && "Cannot operate on empty IntervalPartitions!");
 


Index: llvm/lib/Analysis/LoadValueNumbering.cpp
diff -u llvm/lib/Analysis/LoadValueNumbering.cpp:1.39 llvm/lib/Analysis/LoadValueNumbering.cpp:1.40
--- llvm/lib/Analysis/LoadValueNumbering.cpp:1.39	Tue Apr 17 12:52:45 2007
+++ llvm/lib/Analysis/LoadValueNumbering.cpp	Tue May  1 16:15:46 2007
@@ -40,6 +40,8 @@
 namespace {
   // FIXME: This should not be a FunctionPass.
   struct VISIBILITY_HIDDEN LoadVN : public FunctionPass, public ValueNumbering {
+    static const int ID; // Class identification, replacement for typeinfo
+    LoadVN() : FunctionPass((intptr_t)&ID) {}
 
     /// Pass Implementation stuff.  This doesn't do any analysis.
     ///
@@ -81,6 +83,7 @@
                                  std::vector &RetVals) const;
   };
 
+  const int LoadVN::ID = 0;
   // Register this pass...
   RegisterPass X("load-vn", "Load Value Numbering");
 


Index: llvm/lib/Analysis/LoopInfo.cpp
diff -u llvm/lib/Analysis/LoopInfo.cpp:1.83 llvm/lib/Analysis/LoopInfo.cpp:1.84
--- llvm/lib/Analysis/LoopInfo.cpp:1.83	Sat Mar  3 22:06:39 2007
+++ llvm/lib/Analysis/LoopInfo.cpp	Tue May  1 16:15:46 2007
@@ -27,6 +27,7 @@
 #include 
 using namespace llvm;
 
+const int LoopInfo::ID = 0;
 static RegisterPass
 X("loops", "Natural Loop Construction", true);
 


Index: llvm/lib/Analysis/LoopPass.cpp
diff -u llvm/lib/Analysis/LoopPass.cpp:1.18 llvm/lib/Analysis/LoopPass.cpp:1.19
--- llvm/lib/Analysis/LoopPass.cpp:1.18	Wed Mar  7 00:39:01 2007
+++ llvm/lib/Analysis/LoopPass.cpp	Tue May  1 16:15:46 2007
@@ -20,9 +20,12 @@
 //===----------------------------------------------------------------------===//
 // LPPassManager
 //
+
+const int LPPassManager::ID = 0;
 /// LPPassManager manages FPPassManagers and CalLGraphSCCPasses.
 
-LPPassManager::LPPassManager(int Depth) : PMDataManager(Depth) { 
+LPPassManager::LPPassManager(int Depth) 
+  : FunctionPass((intptr_t)&ID), PMDataManager(Depth) { 
   skipThisLoop = false;
   redoThisLoop = false;
   LI = NULL;


Index: llvm/lib/Analysis/PostDominators.cpp
diff -u llvm/lib/Analysis/PostDominators.cpp:1.67 llvm/lib/Analysis/PostDominators.cpp:1.68
--- llvm/lib/Analysis/PostDominators.cpp:1.67	Tue Apr 17 20:19:55 2007
+++ llvm/lib/Analysis/PostDominators.cpp	Tue May  1 16:15:46 2007
@@ -22,6 +22,9 @@
 //  PostDominatorTree Implementation
 //===----------------------------------------------------------------------===//
 
+const int PostDominatorTree::ID = 0;
+const int PostDominanceFrontier::ID = 0;
+const int PostETForest::ID = 0;
 static RegisterPass
 F("postdomtree", "Post-Dominator Tree Construction", true);
 


Index: llvm/lib/Analysis/ProfileInfo.cpp
diff -u llvm/lib/Analysis/ProfileInfo.cpp:1.11 llvm/lib/Analysis/ProfileInfo.cpp:1.12
--- llvm/lib/Analysis/ProfileInfo.cpp:1.11	Thu Mar 22 11:38:57 2007
+++ llvm/lib/Analysis/ProfileInfo.cpp	Tue May  1 16:15:46 2007
@@ -22,6 +22,7 @@
 
 // Register the ProfileInfo interface, providing a nice name to refer to.
 namespace {
+  const int ProfileInfo::ID = 0;
   RegisterAnalysisGroup Z("Profile Information");
 }
 
@@ -84,8 +85,12 @@
 
 namespace {
   struct VISIBILITY_HIDDEN NoProfileInfo 
-    : public ImmutablePass, public ProfileInfo {};
+    : public ImmutablePass, public ProfileInfo {
+    static const int ID; // Class identification, replacement for typeinfo
+    NoProfileInfo() : ImmutablePass((intptr_t)&ID) {}
+  };
 
+  const int NoProfileInfo::ID = 0;
   // Register this pass...
   RegisterPass
   X("no-profile", "No Profile Information");


Index: llvm/lib/Analysis/ProfileInfoLoaderPass.cpp
diff -u llvm/lib/Analysis/ProfileInfoLoaderPass.cpp:1.18 llvm/lib/Analysis/ProfileInfoLoaderPass.cpp:1.19
--- llvm/lib/Analysis/ProfileInfoLoaderPass.cpp:1.18	Mon Feb  5 17:42:17 2007
+++ llvm/lib/Analysis/ProfileInfoLoaderPass.cpp	Tue May  1 16:15:46 2007
@@ -32,8 +32,9 @@
   class VISIBILITY_HIDDEN LoaderPass : public ModulePass, public ProfileInfo {
     std::string Filename;
   public:
+    static const int ID; // Class identification, replacement for typeinfo
     LoaderPass(const std::string &filename = "")
-      : Filename(filename) {
+      : ModulePass((intptr_t)&ID), Filename(filename) {
       if (filename.empty()) Filename = ProfileInfoFilename;
     }
 
@@ -49,6 +50,7 @@
     virtual bool runOnModule(Module &M);
   };
 
+  const int LoaderPass::ID = 0;
   RegisterPass
   X("profile-loader", "Load profile information from llvmprof.out");
 


Index: llvm/lib/Analysis/ScalarEvolution.cpp
diff -u llvm/lib/Analysis/ScalarEvolution.cpp:1.112 llvm/lib/Analysis/ScalarEvolution.cpp:1.113
--- llvm/lib/Analysis/ScalarEvolution.cpp:1.112	Sun Apr 15 21:24:41 2007
+++ llvm/lib/Analysis/ScalarEvolution.cpp	Tue May  1 16:15:46 2007
@@ -102,6 +102,7 @@
                         cl::init(100));
 
 namespace {
+  const int ScalarEvolution::ID = 0;
   RegisterPass
   R("scalar-evolution", "Scalar Evolution Analysis");
 }


Index: llvm/lib/Analysis/ValueNumbering.cpp
diff -u llvm/lib/Analysis/ValueNumbering.cpp:1.25 llvm/lib/Analysis/ValueNumbering.cpp:1.26
--- llvm/lib/Analysis/ValueNumbering.cpp:1.25	Mon Feb  5 17:42:17 2007
+++ llvm/lib/Analysis/ValueNumbering.cpp	Tue May  1 16:15:46 2007
@@ -22,6 +22,7 @@
 #include "llvm/Support/Compiler.h"
 using namespace llvm;
 
+const int ValueNumbering::ID = 0;
 // Register the ValueNumbering interface, providing a nice name to refer to.
 static RegisterAnalysisGroup X("Value Numbering");
 
@@ -51,6 +52,9 @@
   ///
   struct VISIBILITY_HIDDEN BasicVN 
       : public ImmutablePass, public ValueNumbering {
+    static const int ID; // Class identification, replacement for typeinfo
+    BasicVN() : ImmutablePass((intptr_t)&ID) {}
+
     /// getEqualNumberNodes - Return nodes with the same value number as the
     /// specified Value.  This fills in the argument vector with any equal
     /// values.
@@ -61,6 +65,7 @@
                                      std::vector &RetVals) const;
   };
 
+  const int BasicVN::ID = 0;
   // Register this pass...
   RegisterPass
   X("basicvn", "Basic Value Numbering (default GVN impl)");





From asl at math.spbu.ru  Tue May  1 17:23:37 2007
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Tue, 1 May 2007 17:23:37 -0500
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/DwarfWriter.cpp
Message-ID: <200705012223.l41MNbTs001594@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen:

DwarfWriter.cpp updated: 1.132 -> 1.133
---
Log message:

Fix couple of bugs connected with eh info:
1. Correct output offsets on Linux
2. Fix "style" of personality function. It shouldn't be indirect.


---
Diffs of the changes:  (+27 -15)

 DwarfWriter.cpp |   42 +++++++++++++++++++++++++++---------------
 1 files changed, 27 insertions(+), 15 deletions(-)


Index: llvm/lib/CodeGen/DwarfWriter.cpp
diff -u llvm/lib/CodeGen/DwarfWriter.cpp:1.132 llvm/lib/CodeGen/DwarfWriter.cpp:1.133
--- llvm/lib/CodeGen/DwarfWriter.cpp:1.132	Wed Mar  7 02:25:02 2007
+++ llvm/lib/CodeGen/DwarfWriter.cpp	Tue May  1 17:23:12 2007
@@ -914,13 +914,20 @@
 
   void EmitSectionOffset(const char* Label, const char* Section,
                          unsigned LabelNumber, unsigned SectionNumber,
-                         bool IsSmall = false) {
+                         bool IsSmall = false, bool isEH = false) {
+    bool printAbsolute = false;
     if (TAI->needsSet()) {
       O << "\t.set\t";
       PrintLabelName("set", SetCounter);
       O << ",";
       PrintLabelName(Label, LabelNumber, true);
-      if (!TAI->isAbsoluteSectionOffsets()) {
+
+      if (isEH)
+        printAbsolute = TAI->isAbsoluteEHSectionOffsets();
+      else
+        printAbsolute = TAI->isAbsoluteDebugSectionOffsets();
+      
+      if (!printAbsolute) {
         O << "-";
         PrintLabelName(Section, SectionNumber);
       }      
@@ -940,7 +947,13 @@
         O << TAI->getData64bitsDirective();
         
       PrintLabelName(Label, LabelNumber, true);
-      if (!TAI->isAbsoluteSectionOffsets()) {
+
+      if (isEH)
+        printAbsolute = TAI->isAbsoluteEHSectionOffsets();
+      else
+        printAbsolute = TAI->isAbsoluteDebugSectionOffsets();
+
+      if (!printAbsolute) {
         O << "-";
         PrintLabelName(Section, SectionNumber);
       }
@@ -1688,7 +1701,7 @@
   CompileUnit *NewCompileUnit(CompileUnitDesc *UnitDesc, unsigned ID) {
     // Construct debug information entry.
     DIE *Die = new DIE(DW_TAG_compile_unit);
-    if (TAI->isAbsoluteSectionOffsets())
+    if (TAI->isAbsoluteDebugSectionOffsets())
       AddLabel(Die, DW_AT_stmt_list, DW_FORM_data4, DWLabel("section_line", 0));
     else
       AddDelta(Die, DW_AT_stmt_list, DW_FORM_data4, DWLabel("section_line", 0),
@@ -2107,7 +2120,7 @@
                            
     Asm->EmitInt32(ContentSize);  Asm->EOL("Length of Compilation Unit Info");
     Asm->EmitInt16(DWARF_VERSION); Asm->EOL("DWARF version number");
-    EmitSectionOffset("abbrev_begin", "section_abbrev", 0, 0, true);
+    EmitSectionOffset("abbrev_begin", "section_abbrev", 0, 0, true, false);
     Asm->EOL("Offset Into Abbrev. Section");
     Asm->EmitInt8(TAI->getAddressSize()); Asm->EOL("Address Size (in bytes)");
   
@@ -2366,7 +2379,7 @@
     
     EmitLabel("frame_begin", SubprogramCount);
 
-    EmitSectionOffset("frame_common_begin", "section_frame", 0, 0, true);
+    EmitSectionOffset("frame_common_begin", "section_frame", 0, 0, true, false);
     Asm->EOL("FDE CIE offset");
 
     EmitReference("func_begin", SubprogramCount);
@@ -2401,7 +2414,8 @@
     
     Asm->EmitInt16(DWARF_VERSION); Asm->EOL("DWARF Version");
 
-    EmitSectionOffset("info_begin", "section_info", Unit->getID(), 0, true);
+    EmitSectionOffset("info_begin", "section_info",
+                      Unit->getID(), 0, true, false);
     Asm->EOL("Offset of Compilation Unit Info");
 
     EmitDifference("info_end", Unit->getID(), "info_begin", Unit->getID(),true);
@@ -2769,10 +2783,8 @@
     if (Personality) {
       Asm->EmitULEB128Bytes(7);
       Asm->EOL("Augmentation Size");
-      Asm->EmitInt8(DW_EH_PE_indirect |
-                            DW_EH_PE_pcrel |
-                            DW_EH_PE_sdata4);
-      Asm->EOL("Personality (indirect pcrel sdata4)");
+      Asm->EmitInt8(DW_EH_PE_pcrel | DW_EH_PE_sdata4);
+      Asm->EOL("Personality (pcrel sdata4)");
       
       O << TAI->getData32bitsDirective();
       Asm->EmitExternalGlobal((const GlobalVariable *)(Personality));
@@ -2830,7 +2842,7 @@
       EmitLabel("eh_frame_begin", SubprogramCount);
 
       EmitSectionOffset("eh_frame_begin", "section_eh_frame",
-                        SubprogramCount, 0, true);
+                        SubprogramCount, 0, true, true);
       Asm->EOL("FDE CIE offset");
 
       EmitReference("eh_func_begin", SubprogramCount, true);
@@ -2994,7 +3006,7 @@
     for (unsigned i = 0, N = LandingPads.size(); i != N; ++i) {
       const LandingPadInfo &LandingPad = LandingPads[i];
       EmitSectionOffset("label", "eh_func_begin",
-                        LandingPad.BeginLabel, SubprogramCount);
+                        LandingPad.BeginLabel, SubprogramCount, false, true);
       Asm->EOL("Region start");
       
       EmitDifference("label", LandingPad.EndLabel,
@@ -3007,8 +3019,8 @@
         else
           Asm->EmitInt64(0);
       } else {
-        EmitSectionOffset("label", "eh_func_begin",
-                          LandingPad.LandingPadLabel, SubprogramCount);
+        EmitSectionOffset("label", "eh_func_begin", LandingPad.LandingPadLabel,
+                          SubprogramCount, false, true);
       }
       Asm->EOL("Landing pad");
 





From asl at math.spbu.ru  Tue May  1 17:23:41 2007
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Tue, 1 May 2007 17:23:41 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Target/TargetAsmInfo.h
Message-ID: <200705012223.l41MNf9L001601@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Target:

TargetAsmInfo.h updated: 1.31 -> 1.32
---
Log message:

Fix couple of bugs connected with eh info:
1. Correct output offsets on Linux
2. Fix "style" of personality function. It shouldn't be indirect.


---
Diffs of the changes:  (+13 -6)

 TargetAsmInfo.h |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)


Index: llvm/include/llvm/Target/TargetAsmInfo.h
diff -u llvm/include/llvm/Target/TargetAsmInfo.h:1.31 llvm/include/llvm/Target/TargetAsmInfo.h:1.32
--- llvm/include/llvm/Target/TargetAsmInfo.h:1.31	Sun Apr 29 14:17:45 2007
+++ llvm/include/llvm/Target/TargetAsmInfo.h	Tue May  1 17:23:12 2007
@@ -263,10 +263,14 @@
 
     //===--- Dwarf Emission Directives -----------------------------------===//
 
-    /// AbsoluteSectionOffsets - True if we should emit abolute section
-    /// offsets. Defaults to false.
-    bool AbsoluteSectionOffsets;
-    
+    /// AbsoluteDebugSectionOffsets - True if we should emit abolute section
+    /// offsets for debug information. Defaults to false.
+    bool AbsoluteDebugSectionOffsets;
+
+    /// AbsoluteEHSectionOffsets - True if we should emit abolute section
+    /// offsets for EH information. Defaults to false.
+    bool AbsoluteEHSectionOffsets;
+
     /// HasLEB128 - True if target asm supports leb128 directives.
     ///
     bool HasLEB128; // Defaults to false.
@@ -530,8 +534,11 @@
     const char *getProtectedDirective() const {
       return ProtectedDirective;
     }
-    bool isAbsoluteSectionOffsets() const {
-      return AbsoluteSectionOffsets;
+    bool isAbsoluteDebugSectionOffsets() const {
+      return AbsoluteDebugSectionOffsets;
+    }
+    bool isAbsoluteEHSectionOffsets() const {
+      return AbsoluteEHSectionOffsets;
     }
     bool hasLEB128() const {
       return HasLEB128;





From asl at math.spbu.ru  Tue May  1 17:23:41 2007
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Tue, 1 May 2007 17:23:41 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/TargetAsmInfo.cpp
Message-ID: <200705012223.l41MNfw3001603@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target:

TargetAsmInfo.cpp updated: 1.24 -> 1.25
---
Log message:

Fix couple of bugs connected with eh info:
1. Correct output offsets on Linux
2. Fix "style" of personality function. It shouldn't be indirect.


---
Diffs of the changes:  (+2 -1)

 TargetAsmInfo.cpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)


Index: llvm/lib/Target/TargetAsmInfo.cpp
diff -u llvm/lib/Target/TargetAsmInfo.cpp:1.24 llvm/lib/Target/TargetAsmInfo.cpp:1.25
--- llvm/lib/Target/TargetAsmInfo.cpp:1.24	Sun Apr 29 13:35:00 2007
+++ llvm/lib/Target/TargetAsmInfo.cpp	Tue May  1 17:23:12 2007
@@ -75,7 +75,8 @@
   WeakRefDirective(0),
   HiddenDirective("\t.hidden\t"),
   ProtectedDirective("\t.protected\t"),
-  AbsoluteSectionOffsets(false),
+  AbsoluteDebugSectionOffsets(false),
+  AbsoluteEHSectionOffsets(false),
   HasLEB128(false),
   HasDotLoc(false),
   HasDotFile(false),





From asl at math.spbu.ru  Tue May  1 17:23:42 2007
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Tue, 1 May 2007 17:23:42 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86TargetAsmInfo.cpp
Message-ID: <200705012223.l41MNgX6001611@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

X86TargetAsmInfo.cpp updated: 1.38 -> 1.39
---
Log message:

Fix couple of bugs connected with eh info:
1. Correct output offsets on Linux
2. Fix "style" of personality function. It shouldn't be indirect.


---
Diffs of the changes:  (+4 -2)

 X86TargetAsmInfo.cpp |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


Index: llvm/lib/Target/X86/X86TargetAsmInfo.cpp
diff -u llvm/lib/Target/X86/X86TargetAsmInfo.cpp:1.38 llvm/lib/Target/X86/X86TargetAsmInfo.cpp:1.39
--- llvm/lib/Target/X86/X86TargetAsmInfo.cpp:1.38	Tue May  1 05:19:31 2007
+++ llvm/lib/Target/X86/X86TargetAsmInfo.cpp	Tue May  1 17:23:12 2007
@@ -99,7 +99,8 @@
   case X86Subtarget::isELF:
     // Set up DWARF directives
     HasLEB128 = true;  // Target asm supports leb128 directives (little-endian)
-    AbsoluteSectionOffsets = true;
+    AbsoluteDebugSectionOffsets = true;
+    AbsoluteEHSectionOffsets = false;
     // bool HasLEB128; // Defaults to false.
     // hasDotLoc - True if target asm supports .loc directives.
     // bool HasDotLoc; // Defaults to false.
@@ -141,7 +142,8 @@
 
     // Set up DWARF directives
     HasLEB128 = true;  // Target asm supports leb128 directives (little-endian)
-    AbsoluteSectionOffsets = true;
+    AbsoluteDebugSectionOffsets = true;
+    AbsoluteEHSectionOffsets = false;
     PrivateGlobalPrefix = "L";  // Prefix for private global symbols
     WeakRefDirective = "\t.weak\t";
     SetDirective = "\t.set\t";





From dalej at apple.com  Tue May  1 20:03:00 2007
From: dalej at apple.com (Dale Johannesen)
Date: Tue, 1 May 2007 20:03:00 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/ARM/ARMTargetAsmInfo.h
	ARMTargetAsmInfo.cpp
Message-ID: <200705020103.l42130Kr004648@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/ARM:

ARMTargetAsmInfo.h updated: 1.3 -> 1.4
ARMTargetAsmInfo.cpp updated: 1.18 -> 1.19
---
Log message:

Add some support for (Darwin) code-generating directives in getInlineAsmLength.
Support is incomplete, but more accurate than gcc's.


---
Diffs of the changes:  (+115 -18)

 ARMTargetAsmInfo.cpp |  128 ++++++++++++++++++++++++++++++++++++++++++++-------
 ARMTargetAsmInfo.h   |    5 +
 2 files changed, 115 insertions(+), 18 deletions(-)


Index: llvm/lib/Target/ARM/ARMTargetAsmInfo.h
diff -u llvm/lib/Target/ARM/ARMTargetAsmInfo.h:1.3 llvm/lib/Target/ARM/ARMTargetAsmInfo.h:1.4
--- llvm/lib/Target/ARM/ARMTargetAsmInfo.h:1.3	Sun Apr 29 14:17:45 2007
+++ llvm/lib/Target/ARM/ARMTargetAsmInfo.h	Tue May  1 20:02:40 2007
@@ -15,6 +15,7 @@
 #define ARMTARGETASMINFO_H
 
 #include "llvm/Target/TargetAsmInfo.h"
+#include "ARMSubtarget.h"
 
 namespace llvm {
 
@@ -24,9 +25,11 @@
   struct ARMTargetAsmInfo : public TargetAsmInfo {
     ARMTargetAsmInfo(const ARMTargetMachine &TM);
 
-    bool isThumb;
+    const ARMSubtarget *Subtarget;
 
     virtual unsigned getInlineAsmLength(const char *Str) const;
+    unsigned countArguments(const char *p) const;
+    unsigned countString(const char *p) const;
   };
 
 


Index: llvm/lib/Target/ARM/ARMTargetAsmInfo.cpp
diff -u llvm/lib/Target/ARM/ARMTargetAsmInfo.cpp:1.18 llvm/lib/Target/ARM/ARMTargetAsmInfo.cpp:1.19
--- llvm/lib/Target/ARM/ARMTargetAsmInfo.cpp:1.18	Sun Apr 29 19:30:48 2007
+++ llvm/lib/Target/ARM/ARMTargetAsmInfo.cpp	Tue May  1 20:02:40 2007
@@ -1,3 +1,4 @@
+
 //===-- ARMTargetAsmInfo.cpp - ARM asm properties ---------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
@@ -18,7 +19,7 @@
 using namespace llvm;
 
 ARMTargetAsmInfo::ARMTargetAsmInfo(const ARMTargetMachine &TM) {
-  const ARMSubtarget *Subtarget = &TM.getSubtarget();
+  Subtarget = &TM.getSubtarget();
   if (Subtarget->isTargetDarwin()) {
     GlobalPrefix = "_";
     PrivateGlobalPrefix = "L";
@@ -85,13 +86,42 @@
   InlineAsmStart = "@ InlineAsm Start";
   InlineAsmEnd = "@ InlineAsm End";
   LCOMMDirective = "\t.lcomm\t";
-  isThumb = Subtarget->isThumb();
+}
+
+/// Count the number of comma-separated arguments.
+/// Do not try to detect errors.
+unsigned ARMTargetAsmInfo::countArguments(const char* p) const {
+  unsigned count = 0;
+  while (*p && isspace(*p) && *p != '\n')
+    p++;
+  count++;
+  while (*p && *p!='\n' && 
+         strncmp(p, CommentString, strlen(CommentString))!=0) {
+    if (*p==',')
+      count++;
+    p++;
+  }
+  return count;
+}
+
+/// Count the length of a string enclosed in quote characters.
+/// Do not try to detect errors.
+unsigned ARMTargetAsmInfo::countString(const char* p) const {
+  unsigned count = 0;
+  while (*p && isspace(*p) && *p!='\n')
+    p++;
+  if (!*p || *p != '\"')
+    return count;
+  while (*++p && *p != '\"')
+    count++;
+  return count;
 }
 
 /// ARM-specific version of TargetAsmInfo::getInlineAsmLength.
 unsigned ARMTargetAsmInfo::getInlineAsmLength(const char *Str) const {
   // Count the number of bytes in the asm.
   bool atInsnStart = true;
+  bool inTextSection = true;
   unsigned Length = 0;
   for (; *Str; ++Str) {
     if (atInsnStart) {
@@ -102,30 +132,94 @@
       for (const char* p = Str; *p && !isspace(*p); p++)
         if (*p == ':') {
           Str = p+1;
+          while (*Str && isspace(*Str) && *Str != '\n')
+            Str++;
           break;
         }
       // Ignore everything from comment char(s) to EOL
       if (strncmp(Str, CommentString, strlen(CommentString))==-0)
         atInsnStart = false;
-      else {
+      // FIXME do something like the following for non-Darwin
+      else if (*Str == '.' && Subtarget->isTargetDarwin()) {
+        // Directive.
+        atInsnStart = false;
+        // Some change the section, but don't generate code.
+        if (strncasecmp(Str, ".literal4", strlen(".literal4"))==0 ||
+            strncasecmp(Str, ".literal8", strlen(".literal8"))==0 ||
+            strncasecmp(Str, ".const", strlen(".const"))==0 ||
+            strncasecmp(Str, ".constructor", strlen(".constructor"))==0 ||
+            strncasecmp(Str, ".cstring", strlen(".cstring"))==0 ||
+            strncasecmp(Str, ".data", strlen(".data"))==0 ||
+            strncasecmp(Str, ".destructor", strlen(".destructor"))==0 ||
+            strncasecmp(Str, ".fvmlib_init0", strlen(".fvmlib_init0"))==0 ||
+            strncasecmp(Str, ".fvmlib_init1", strlen(".fvmlib_init1"))==0 ||
+            strncasecmp(Str, ".mod_init_func", strlen(".mod_init_func"))==0 ||
+            strncasecmp(Str, ".mod_term_func", strlen(".mod_term_func"))==0 ||
+            strncasecmp(Str, ".picsymbol_stub", strlen(".picsymbol_stub"))==0 ||
+            strncasecmp(Str, ".symbol_stub", strlen(".symbol_stub"))==0 ||
+            strncasecmp(Str, ".static_data", strlen(".static_data"))==0 ||
+            strncasecmp(Str, ".section", strlen(".section"))==0 ||
+            strncasecmp(Str, ".lazy_symbol_pointer", strlen(".lazy_symbol_pointer"))==0 ||
+            strncasecmp(Str, ".non_lazy_symbol_pointer", strlen(".non_lazy_symbol_pointer"))==0 ||
+            strncasecmp(Str, ".dyld", strlen(".dyld"))==0 ||
+            strncasecmp(Str, ".const_data", strlen(".const_data"))==0 ||
+            strncasecmp(Str, ".objc", strlen(".objc"))==0 ||       //// many directives
+            strncasecmp(Str, ".static_const", strlen(".static_const"))==0)
+          inTextSection=false;
+        else if (strncasecmp(Str, ".text", strlen(".text"))==0)
+          inTextSection = true;
+        // Some can't really be handled without implementing significant pieces
+        // of an assembler.  Others require dynamic adjustment of block sizes in
+        // AdjustBBOffsetsAfter; it's a big compile-time speed hit to check every
+        // instruction in there, and none of these are currently used in the kernel.
+        else if (strncasecmp(Str, ".macro", strlen(".macro"))==0 ||
+                 strncasecmp(Str, ".if", strlen(".if"))==0 ||
+                 strncasecmp(Str, ".align", strlen(".align"))==0 ||
+                 strncasecmp(Str, ".fill", strlen(".fill"))==0 ||
+                 strncasecmp(Str, ".space", strlen(".space"))==0 ||
+                 strncasecmp(Str, ".zerofill", strlen(".zerofill"))==0 ||
+                 strncasecmp(Str, ".p2align", strlen(".p2align"))==0 ||
+                 strncasecmp(Str, ".p2alignw", strlen(".p2alignw"))==0 ||
+                 strncasecmp(Str, ".p2alignl", strlen(".p2alignl"))==0 ||
+                 strncasecmp(Str, ".align32", strlen(".p2align32"))==0 ||
+                 strncasecmp(Str, ".include", strlen(".include"))==0)
+          cerr << "Directive " << Str << " in asm may lead to invalid offsets for" <<
+                   " constant pools (the assembler will tell you if this happens).\n";
+        // Some generate code, but this is only interesting in the text section.
+        else if (inTextSection) {
+          if (strncasecmp(Str, ".long", strlen(".long"))==0)
+            Length += 4*countArguments(Str+strlen(".long"));
+          else if (strncasecmp(Str, ".short", strlen(".short"))==0)
+            Length += 2*countArguments(Str+strlen(".short"));
+          else if (strncasecmp(Str, ".byte", strlen(".byte"))==0)
+            Length += 1*countArguments(Str+strlen(".byte"));
+          else if (strncasecmp(Str, ".single", strlen(".single"))==0)
+            Length += 4*countArguments(Str+strlen(".single"));
+          else if (strncasecmp(Str, ".double", strlen(".double"))==0)
+            Length += 8*countArguments(Str+strlen(".double"));
+          else if (strncasecmp(Str, ".quad", strlen(".quad"))==0)
+            Length += 16*countArguments(Str+strlen(".quad"));
+          else if (strncasecmp(Str, ".ascii", strlen(".ascii"))==0)
+            Length += countString(Str+strlen(".ascii"));
+          else if (strncasecmp(Str, ".asciz", strlen(".asciz"))==0)
+            Length += countString(Str+strlen(".asciz"))+1;
+        }
+      } else if (inTextSection) {
         // An instruction
         atInsnStart = false;
-        if (isThumb) {
+        if (Subtarget->isThumb()) {
           // BL and BLX  are 4 bytes, all others 2.
-          if ((*Str=='b' || *Str=='B') &&
-              (*(Str+1)=='l' || *(Str+1)=='L')) {
-            if (*(Str+2)=='x' || *(Str+2)=='X') {
-              const char* p = Str+3;
-              while (*p && isspace(*p))
-                p++;
-              if (*p == 'r' || *p=='R')
-                Length += 2;    // BLX reg
-              else
-                Length += 4;    // BLX non-reg
-            }
+          if (strncasecmp(Str, "blx", strlen("blx"))==0) {
+            const char* p = Str+3;
+            while (*p && isspace(*p))
+              p++;
+            if (*p == 'r' || *p=='R')
+              Length += 2;    // BLX reg
             else
-              Length += 4;    // BL
-          } else
+              Length += 4;    // BLX non-reg
+          } else if (strncasecmp(Str, "bl", strlen("bl"))==0)
+            Length += 4;    // BL
+          else
             Length += 2;    // Thumb anything else
         }
         else





From evan.cheng at apple.com  Tue May  1 20:10:23 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Tue, 1 May 2007 18:10:23 -0700
Subject: [llvm-commits] CVS: llvm/lib/Target/ARM/ARMTargetAsmInfo.h
	ARMTargetAsmInfo.cpp
In-Reply-To: <200705020103.l42130Kr004648@zion.cs.uiuc.edu>
References: <200705020103.l42130Kr004648@zion.cs.uiuc.edu>
Message-ID: 

Woot! Fun stuff. :-)

Thanks Dale.

Evan
On May 1, 2007, at 6:03 PM, Dale Johannesen wrote:

>
>
> Changes in directory llvm/lib/Target/ARM:
>
> ARMTargetAsmInfo.h updated: 1.3 -> 1.4
> ARMTargetAsmInfo.cpp updated: 1.18 -> 1.19
> ---
> Log message:
>
> Add some support for (Darwin) code-generating directives in  
> getInlineAsmLength.
> Support is incomplete, but more accurate than gcc's.
>
>
> ---
> Diffs of the changes:  (+115 -18)
>
>  ARMTargetAsmInfo.cpp |  128 +++++++++++++++++++++++++++++++++++++++ 
> +++++-------
>  ARMTargetAsmInfo.h   |    5 +
>  2 files changed, 115 insertions(+), 18 deletions(-)
>
>
> Index: llvm/lib/Target/ARM/ARMTargetAsmInfo.h
> diff -u llvm/lib/Target/ARM/ARMTargetAsmInfo.h:1.3 llvm/lib/Target/ 
> ARM/ARMTargetAsmInfo.h:1.4
> --- llvm/lib/Target/ARM/ARMTargetAsmInfo.h:1.3	Sun Apr 29 14:17:45  
> 2007
> +++ llvm/lib/Target/ARM/ARMTargetAsmInfo.h	Tue May  1 20:02:40 2007
> @@ -15,6 +15,7 @@
>  #define ARMTARGETASMINFO_H
>
>  #include "llvm/Target/TargetAsmInfo.h"
> +#include "ARMSubtarget.h"
>
>  namespace llvm {
>
> @@ -24,9 +25,11 @@
>    struct ARMTargetAsmInfo : public TargetAsmInfo {
>      ARMTargetAsmInfo(const ARMTargetMachine &TM);
>
> -    bool isThumb;
> +    const ARMSubtarget *Subtarget;
>
>      virtual unsigned getInlineAsmLength(const char *Str) const;
> +    unsigned countArguments(const char *p) const;
> +    unsigned countString(const char *p) const;
>    };
>
>
>
>
> Index: llvm/lib/Target/ARM/ARMTargetAsmInfo.cpp
> diff -u llvm/lib/Target/ARM/ARMTargetAsmInfo.cpp:1.18 llvm/lib/ 
> Target/ARM/ARMTargetAsmInfo.cpp:1.19
> --- llvm/lib/Target/ARM/ARMTargetAsmInfo.cpp:1.18	Sun Apr 29  
> 19:30:48 2007
> +++ llvm/lib/Target/ARM/ARMTargetAsmInfo.cpp	Tue May  1 20:02:40 2007
> @@ -1,3 +1,4 @@
> +
>  //===-- ARMTargetAsmInfo.cpp - ARM asm properties --------------- 
> *- C++ -*-===//
>  //
>  //                     The LLVM Compiler Infrastructure
> @@ -18,7 +19,7 @@
>  using namespace llvm;
>
>  ARMTargetAsmInfo::ARMTargetAsmInfo(const ARMTargetMachine &TM) {
> -  const ARMSubtarget *Subtarget = &TM.getSubtarget();
> +  Subtarget = &TM.getSubtarget();
>    if (Subtarget->isTargetDarwin()) {
>      GlobalPrefix = "_";
>      PrivateGlobalPrefix = "L";
> @@ -85,13 +86,42 @@
>    InlineAsmStart = "@ InlineAsm Start";
>    InlineAsmEnd = "@ InlineAsm End";
>    LCOMMDirective = "\t.lcomm\t";
> -  isThumb = Subtarget->isThumb();
> +}
> +
> +/// Count the number of comma-separated arguments.
> +/// Do not try to detect errors.
> +unsigned ARMTargetAsmInfo::countArguments(const char* p) const {
> +  unsigned count = 0;
> +  while (*p && isspace(*p) && *p != '\n')
> +    p++;
> +  count++;
> +  while (*p && *p!='\n' &&
> +         strncmp(p, CommentString, strlen(CommentString))!=0) {
> +    if (*p==',')
> +      count++;
> +    p++;
> +  }
> +  return count;
> +}
> +
> +/// Count the length of a string enclosed in quote characters.
> +/// Do not try to detect errors.
> +unsigned ARMTargetAsmInfo::countString(const char* p) const {
> +  unsigned count = 0;
> +  while (*p && isspace(*p) && *p!='\n')
> +    p++;
> +  if (!*p || *p != '\"')
> +    return count;
> +  while (*++p && *p != '\"')
> +    count++;
> +  return count;
>  }
>
>  /// ARM-specific version of TargetAsmInfo::getInlineAsmLength.
>  unsigned ARMTargetAsmInfo::getInlineAsmLength(const char *Str)  
> const {
>    // Count the number of bytes in the asm.
>    bool atInsnStart = true;
> +  bool inTextSection = true;
>    unsigned Length = 0;
>    for (; *Str; ++Str) {
>      if (atInsnStart) {
> @@ -102,30 +132,94 @@
>        for (const char* p = Str; *p && !isspace(*p); p++)
>          if (*p == ':') {
>            Str = p+1;
> +          while (*Str && isspace(*Str) && *Str != '\n')
> +            Str++;
>            break;
>          }
>        // Ignore everything from comment char(s) to EOL
>        if (strncmp(Str, CommentString, strlen(CommentString))==-0)
>          atInsnStart = false;
> -      else {
> +      // FIXME do something like the following for non-Darwin
> +      else if (*Str == '.' && Subtarget->isTargetDarwin()) {
> +        // Directive.
> +        atInsnStart = false;
> +        // Some change the section, but don't generate code.
> +        if (strncasecmp(Str, ".literal4", strlen(".literal4"))==0 ||
> +            strncasecmp(Str, ".literal8", strlen(".literal8"))==0 ||
> +            strncasecmp(Str, ".const", strlen(".const"))==0 ||
> +            strncasecmp(Str, ".constructor", strlen 
> (".constructor"))==0 ||
> +            strncasecmp(Str, ".cstring", strlen(".cstring"))==0 ||
> +            strncasecmp(Str, ".data", strlen(".data"))==0 ||
> +            strncasecmp(Str, ".destructor", strlen(".destructor")) 
> ==0 ||
> +            strncasecmp(Str, ".fvmlib_init0", strlen 
> (".fvmlib_init0"))==0 ||
> +            strncasecmp(Str, ".fvmlib_init1", strlen 
> (".fvmlib_init1"))==0 ||
> +            strncasecmp(Str, ".mod_init_func", strlen 
> (".mod_init_func"))==0 ||
> +            strncasecmp(Str, ".mod_term_func", strlen 
> (".mod_term_func"))==0 ||
> +            strncasecmp(Str, ".picsymbol_stub", strlen 
> (".picsymbol_stub"))==0 ||
> +            strncasecmp(Str, ".symbol_stub", strlen 
> (".symbol_stub"))==0 ||
> +            strncasecmp(Str, ".static_data", strlen 
> (".static_data"))==0 ||
> +            strncasecmp(Str, ".section", strlen(".section"))==0 ||
> +            strncasecmp(Str, ".lazy_symbol_pointer", strlen 
> (".lazy_symbol_pointer"))==0 ||
> +            strncasecmp(Str, ".non_lazy_symbol_pointer", strlen 
> (".non_lazy_symbol_pointer"))==0 ||
> +            strncasecmp(Str, ".dyld", strlen(".dyld"))==0 ||
> +            strncasecmp(Str, ".const_data", strlen(".const_data")) 
> ==0 ||
> +            strncasecmp(Str, ".objc", strlen(".objc"))==0  
> ||       //// many directives
> +            strncasecmp(Str, ".static_const", strlen 
> (".static_const"))==0)
> +          inTextSection=false;
> +        else if (strncasecmp(Str, ".text", strlen(".text"))==0)
> +          inTextSection = true;
> +        // Some can't really be handled without implementing  
> significant pieces
> +        // of an assembler.  Others require dynamic adjustment of  
> block sizes in
> +        // AdjustBBOffsetsAfter; it's a big compile-time speed hit  
> to check every
> +        // instruction in there, and none of these are currently  
> used in the kernel.
> +        else if (strncasecmp(Str, ".macro", strlen(".macro"))==0 ||
> +                 strncasecmp(Str, ".if", strlen(".if"))==0 ||
> +                 strncasecmp(Str, ".align", strlen(".align"))==0 ||
> +                 strncasecmp(Str, ".fill", strlen(".fill"))==0 ||
> +                 strncasecmp(Str, ".space", strlen(".space"))==0 ||
> +                 strncasecmp(Str, ".zerofill", strlen(".zerofill")) 
> ==0 ||
> +                 strncasecmp(Str, ".p2align", strlen(".p2align")) 
> ==0 ||
> +                 strncasecmp(Str, ".p2alignw", strlen(".p2alignw")) 
> ==0 ||
> +                 strncasecmp(Str, ".p2alignl", strlen(".p2alignl")) 
> ==0 ||
> +                 strncasecmp(Str, ".align32", strlen(".p2align32")) 
> ==0 ||
> +                 strncasecmp(Str, ".include", strlen(".include"))==0)
> +          cerr << "Directive " << Str << " in asm may lead to  
> invalid offsets for" <<
> +                   " constant pools (the assembler will tell you  
> if this happens).\n";
> +        // Some generate code, but this is only interesting in the  
> text section.
> +        else if (inTextSection) {
> +          if (strncasecmp(Str, ".long", strlen(".long"))==0)
> +            Length += 4*countArguments(Str+strlen(".long"));
> +          else if (strncasecmp(Str, ".short", strlen(".short"))==0)
> +            Length += 2*countArguments(Str+strlen(".short"));
> +          else if (strncasecmp(Str, ".byte", strlen(".byte"))==0)
> +            Length += 1*countArguments(Str+strlen(".byte"));
> +          else if (strncasecmp(Str, ".single", strlen(".single"))==0)
> +            Length += 4*countArguments(Str+strlen(".single"));
> +          else if (strncasecmp(Str, ".double", strlen(".double"))==0)
> +            Length += 8*countArguments(Str+strlen(".double"));
> +          else if (strncasecmp(Str, ".quad", strlen(".quad"))==0)
> +            Length += 16*countArguments(Str+strlen(".quad"));
> +          else if (strncasecmp(Str, ".ascii", strlen(".ascii"))==0)
> +            Length += countString(Str+strlen(".ascii"));
> +          else if (strncasecmp(Str, ".asciz", strlen(".asciz"))==0)
> +            Length += countString(Str+strlen(".asciz"))+1;
> +        }
> +      } else if (inTextSection) {
>          // An instruction
>          atInsnStart = false;
> -        if (isThumb) {
> +        if (Subtarget->isThumb()) {
>            // BL and BLX  are 4 bytes, all others 2.
> -          if ((*Str=='b' || *Str=='B') &&
> -              (*(Str+1)=='l' || *(Str+1)=='L')) {
> -            if (*(Str+2)=='x' || *(Str+2)=='X') {
> -              const char* p = Str+3;
> -              while (*p && isspace(*p))
> -                p++;
> -              if (*p == 'r' || *p=='R')
> -                Length += 2;    // BLX reg
> -              else
> -                Length += 4;    // BLX non-reg
> -            }
> +          if (strncasecmp(Str, "blx", strlen("blx"))==0) {
> +            const char* p = Str+3;
> +            while (*p && isspace(*p))
> +              p++;
> +            if (*p == 'r' || *p=='R')
> +              Length += 2;    // BLX reg
>              else
> -              Length += 4;    // BL
> -          } else
> +              Length += 4;    // BLX non-reg
> +          } else if (strncasecmp(Str, "bl", strlen("bl"))==0)
> +            Length += 4;    // BL
> +          else
>              Length += 2;    // Thumb anything else
>          }
>          else
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From reid at x10sys.com  Tue May  1 20:42:18 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 1 May 2007 20:42:18 -0500
Subject: [llvm-commits] CVS: llvm-www/DevMtgMay2007.html
Message-ID: <200705020142.l421gIOU005376@zion.cs.uiuc.edu>



Changes in directory llvm-www:

DevMtgMay2007.html updated: 1.115 -> 1.116
---
Log message:

Add Alireza Moshtaghi


---
Diffs of the changes:  (+3 -1)

 DevMtgMay2007.html |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)


Index: llvm-www/DevMtgMay2007.html
diff -u llvm-www/DevMtgMay2007.html:1.115 llvm-www/DevMtgMay2007.html:1.116
--- llvm-www/DevMtgMay2007.html:1.115	Fri Apr 27 13:31:19 2007
+++ llvm-www/DevMtgMay2007.html	Tue May  1 20:42:00 2007
@@ -127,6 +127,7 @@
   LLVM, that tutorial you gave last week, etc.
 
+  
@@ -319,6 +320,7 @@
     
+    
@@ -360,6 +362,6 @@
   src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!">
-
Last modified: $Date: 2007/04/27 18:31:19 $
+
Last modified: $Date: 2007/05/02 01:42:00 $
 





From reid at x10sys.com  Tue May  1 21:17:59 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 1 May 2007 21:17:59 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/CBackend/CBackend.cpp
Message-ID: <200705020217.l422HxcB006301@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/CBackend:

CBackend.cpp updated: 1.339 -> 1.340
---
Log message:

Make sign extension work correctly for unusual bit widths.


---
Diffs of the changes:  (+100 -28)

 CBackend.cpp |  128 ++++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 100 insertions(+), 28 deletions(-)


Index: llvm/lib/Target/CBackend/CBackend.cpp
diff -u llvm/lib/Target/CBackend/CBackend.cpp:1.339 llvm/lib/Target/CBackend/CBackend.cpp:1.340
--- llvm/lib/Target/CBackend/CBackend.cpp:1.339	Tue May  1 16:15:46 2007
+++ llvm/lib/Target/CBackend/CBackend.cpp	Tue May  1 21:17:41 2007
@@ -412,6 +412,29 @@
   }
 }
 
+#define IMPL_SIGN_EXTENSION(OpTy, Func) { \
+      const IntegerType* IntTy = cast(OpTy); \
+      unsigned BitWidth = IntTy->getBitWidth(); \
+      if (BitWidth != 8 && BitWidth != 16 && BitWidth != 32 && \
+          BitWidth != 64 && BitWidth != 128) { \
+        const char * Suffix; \
+        if (BitWidth <=32)\
+          Suffix = "U"; \
+        else \
+          Suffix = "ULL"; \
+        Out << "("; \
+        Func; \
+        Out << " & (1" << Suffix << " << " << BitWidth - 1 << " ) ? "; \
+        Func; \
+        Out << " | " << (~IntTy->getBitMask()) << Suffix << " : "; \
+        Func; \
+        Out << " & " << IntTy->getBitMask() << Suffix; \
+        Out << ")";\
+       } \
+      else \
+        Func; \
+      }
+
 // Pass the Type* and the variable name and this prints out the variable
 // declaration.
 //
@@ -711,23 +734,39 @@
     case Instruction::BitCast:
       Out << "(";
       printCast(CE->getOpcode(), CE->getOperand(0)->getType(), CE->getType());
-      if (CE->getOpcode() == Instruction::SExt &&
-          CE->getOperand(0)->getType() == Type::Int1Ty) {
-        // Make sure we really sext from bool here by subtracting from 0
-        Out << "0-";
-      }
-      printConstant(CE->getOperand(0));
-      if (CE->getType() == Type::Int1Ty &&
-          (CE->getOpcode() == Instruction::Trunc ||
+       if (CE->getOpcode() == Instruction::Trunc ||
            CE->getOpcode() == Instruction::FPToUI ||
            CE->getOpcode() == Instruction::FPToSI ||
-           CE->getOpcode() == Instruction::PtrToInt)) {
-        // Make sure we really truncate to bool here by anding with 1
-        Out << "&1u";
+           CE->getOpcode() == Instruction::PtrToInt) {
+        if (const IntegerType* IntTy = dyn_cast(CE->getType())) {
+          uint64_t BitMask = IntTy->getBitMask();
+          printConstant(CE->getOperand(0));
+          Out << "&" << BitMask << (IntTy->getBitWidth() <=32 ? "U": "ULL");
+        }
       }
-      Out << ')';
+      else if (CE->getOpcode() == Instruction::SExt &&
+               CE->getOperand(0)->getType() == Type::Int1Ty) {
+        // Make sure we really sext from bool here by subtracting from 0
+        Out << "0-";
+        printConstant(CE->getOperand(0));
+      }
+      else if (CE->getOpcode() == Instruction::SExt &&
+               CE->getOperand(0)->getType()->getTypeID() == Type::IntegerTyID) {
+         IMPL_SIGN_EXTENSION(CE->getOperand(0)->getType(),
+                             printConstant(CE->getOperand(0)));
+       }
+       else if (CE->getOpcode() == Instruction::ZExt &&
+                CE->getOperand(0)->getType()->getTypeID() == Type::IntegerTyID){
+         const IntegerType* IntTy = 
+           cast(CE->getOperand(0)->getType());
+         uint64_t BitMask = IntTy->getBitMask();
+         writeOperand(CE->getOperand(0));
+         Out << "&" << BitMask << (IntTy->getBitWidth() <=32 ? "U": "ULL");
+       }
+       else
+         printConstant(CE->getOperand(0));
+      Out << ")";
       return;
-
     case Instruction::GetElementPtr:
       Out << "(&(";
       printIndexingExpression(CE->getOperand(0), gep_type_begin(CPV),
@@ -1228,7 +1267,11 @@
     Out << "((";
     printSimpleType(Out, OpTy, castIsSigned);
     Out << ")";
-    writeOperand(Operand);
+    if (castIsSigned && OpTy->getTypeID() == Type::IntegerTyID) {
+      IMPL_SIGN_EXTENSION(OpTy, writeOperand(Operand));
+    }
+    else
+      writeOperand(Operand);
     Out << ")";
   } else 
     writeOperand(Operand);
@@ -1253,7 +1296,9 @@
   switch (predicate) {
     default:
       // for eq and ne, it doesn't matter
-      break; 
+      break;
+    case ICmpInst::ICMP_EQ:
+    case ICmpInst::ICMP_NE:
     case ICmpInst::ICMP_UGT:
     case ICmpInst::ICMP_UGE:
     case ICmpInst::ICMP_ULT:
@@ -1278,10 +1323,25 @@
     else
       printType(Out, OpTy); // not integer, sign doesn't matter
     Out << ")";
-    writeOperand(Operand);
+    if(castIsSigned && OpTy->getTypeID() == Type::IntegerTyID) {
+      IMPL_SIGN_EXTENSION(OpTy, writeOperand(Operand));
+    } else {
+      writeOperand(Operand);
+      if(OpTy->getTypeID() == Type::IntegerTyID){
+        const IntegerType * IntTy = cast(OpTy);
+        uint64_t BitMask = IntTy->getBitMask();
+        Out << "&" << BitMask << (IntTy->getBitWidth() <=32 ? "U": "ULL");
+      }
+    }
     Out << ")";
-  } else 
+  } else {
     writeOperand(Operand);
+    if(OpTy->getTypeID() == Type::IntegerTyID){
+      const IntegerType * IntTy = cast(OpTy);
+      uint64_t BitMask = IntTy->getBitMask();
+      Out << "&" << BitMask << (IntTy->getBitWidth() <=32 ? "U": "ULL");
+    }
+  }
 }
 
 // generateCompilerSpecificCode - This is where we add conditional compilation
@@ -2346,21 +2406,33 @@
         << getFloatBitCastField(I.getType());
   } else {
     printCast(I.getOpcode(), SrcTy, DstTy);
-    if (I.getOpcode() == Instruction::SExt && SrcTy == Type::Int1Ty) {
+    if (I.getOpcode() == Instruction::Trunc ||
+        I.getOpcode() == Instruction::FPToUI ||
+        I.getOpcode() == Instruction::FPToSI ||
+        I.getOpcode() == Instruction::PtrToInt) {
+      if (const IntegerType* IntTy = dyn_cast(DstTy)){
+        uint64_t BitMask = IntTy->getBitMask();
+        writeOperand(I.getOperand(0));
+        Out << "&" << BitMask << (IntTy->getBitWidth() <=32 ? "U": "ULL");
+      }
+    } else if (I.getOpcode() == Instruction::SExt && SrcTy == Type::Int1Ty) {
       // Make sure we really get a sext from bool by subtracing the bool from 0
       Out << "0-";
+      writeOperand(I.getOperand(0));
+    } else if (I.getOpcode() == Instruction::SExt &&
+               SrcTy->getTypeID() == Type::IntegerTyID) {
+      IMPL_SIGN_EXTENSION(SrcTy, writeOperand(I.getOperand(0)) );
+    } else if (I.getOpcode() == Instruction::ZExt &&
+               SrcTy->getTypeID() == Type::IntegerTyID) {
+      const IntegerType* IntTy = cast(SrcTy);
+      uint64_t BitMask = IntTy->getBitMask();
+      writeOperand(I.getOperand(0));
+      Out << "&" << BitMask << (IntTy->getBitWidth() <=32 ? "U": "ULL");
     }
-    writeOperand(I.getOperand(0));
-    if (DstTy == Type::Int1Ty && 
-        (I.getOpcode() == Instruction::Trunc ||
-         I.getOpcode() == Instruction::FPToUI ||
-         I.getOpcode() == Instruction::FPToSI ||
-         I.getOpcode() == Instruction::PtrToInt)) {
-      // Make sure we really get a trunc to bool by anding the operand with 1 
-      Out << "&1u";
-    }
+    else
+      writeOperand(I.getOperand(0));
   }
-  Out << ')';
+  Out << ")";
 }
 
 void CWriter::visitSelectInst(SelectInst &I) {





From reid at x10sys.com  Tue May  1 21:35:43 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 1 May 2007 21:35:43 -0500
Subject: [llvm-commits] CVS: llvm-test/SingleSource/UnitTests/Integer/bits.h
Message-ID: <200705020235.l422Zhgc006682@zion.cs.uiuc.edu>



Changes in directory llvm-test/SingleSource/UnitTests/Integer:

bits.h updated: 1.4 -> 1.5
---
Log message:

Add some bit widths.
Make conversion from hex string easier.


---
Diffs of the changes:  (+9 -1)

 bits.h |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletion(-)


Index: llvm-test/SingleSource/UnitTests/Integer/bits.h
diff -u llvm-test/SingleSource/UnitTests/Integer/bits.h:1.4 llvm-test/SingleSource/UnitTests/Integer/bits.h:1.5
--- llvm-test/SingleSource/UnitTests/Integer/bits.h:1.4	Sat Apr 21 12:47:59 2007
+++ llvm-test/SingleSource/UnitTests/Integer/bits.h	Tue May  1 21:35:26 2007
@@ -40,12 +40,14 @@
 typedef unsigned int __attribute__((bitwidth(68))) uint68;
 typedef unsigned int __attribute__((bitwidth(128))) uint128;
 
-typedef int __attribute__ ((bitwidth(9))) int9;
+typedef int __attribute__((bitwidth(9)))  int9;
 typedef int __attribute__((bitwidth(10))) int10;
 typedef int __attribute__((bitwidth(21))) int21;
 typedef int __attribute__((bitwidth(24))) int24;
 typedef int __attribute__((bitwidth(32))) int32;
 typedef int __attribute__((bitwidth(33))) int33;
+typedef int __attribute__((bitwidth(68))) int68;
+typedef int __attribute__((bitwidth(69))) int69;
 
 typedef int __attribute__((bitwidth(169))) int169;
 typedef unsigned int __attribute__((bitwidth(250))) int250;
@@ -111,3 +113,9 @@
   __builtin_bit_from_string(&Result, str, 10); \
   Result; \
 })
+
+#define bitsFromHexString(str,bits) ({ \
+  int __attribute__((bitwidth(bits))) Result; \
+  __builtin_bit_from_string(&Result, str, 16); \
+  Result; \
+})





From sabre at nondot.org  Tue May  1 23:02:02 2007
From: sabre at nondot.org (Chris Lattner)
Date: Tue, 1 May 2007 23:02:02 -0500
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Pass.cpp
Message-ID: <200705020402.l42422AB008362@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

Pass.cpp updated: 1.88 -> 1.89
---
Log message:

disable this assertion as a hack to get the build more unbroken :(



---
Diffs of the changes:  (+1 -1)

 Pass.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/lib/VMCore/Pass.cpp
diff -u llvm/lib/VMCore/Pass.cpp:1.88 llvm/lib/VMCore/Pass.cpp:1.89
--- llvm/lib/VMCore/Pass.cpp:1.88	Tue May  1 16:15:47 2007
+++ llvm/lib/VMCore/Pass.cpp	Tue May  1 23:01:44 2007
@@ -155,7 +155,7 @@
   void RegisterPass(PassInfo &PI) {
     bool Inserted =
       PassInfoMap.insert(std::make_pair(PI.getTypeInfo(),&PI)).second;
-    assert(Inserted && "Pass registered multiple times!");
+    //assert(Inserted && "Pass registered multiple times!");
   }
   
   void UnregisterPass(PassInfo &PI) {





From clattner at apple.com  Tue May  1 23:15:05 2007
From: clattner at apple.com (Chris Lattner)
Date: Tue, 1 May 2007 21:15:05 -0700
Subject: [llvm-commits] CVS:
	llvm/lib/Target/ARM/ARMConstantIslandPass.cpp
	ARMLoadStoreOptimizer.cpp
In-Reply-To: <200705012117.l41LHfn6031365@zion.cs.uiuc.edu>
References: <200705012117.l41LHfn6031365@zion.cs.uiuc.edu>
Message-ID: 

> +    static const int ID;
> +    ARMConstantIslands() : MachineFunctionPass((intptr_t)&ID) {}

Why the cast to intptr_t?  Why not just make the ctors take void* ?

-Chris





From sabre at nondot.org  Tue May  1 23:25:54 2007
From: sabre at nondot.org (Chris Lattner)
Date: Tue, 1 May 2007 23:25:54 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Pass.h PassSupport.h
Message-ID: <200705020425.l424PsKA008866@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

Pass.h updated: 1.87 -> 1.88
PassSupport.h updated: 1.39 -> 1.40
---
Log message:

revert enough of devang's recent patches to get the tree basically working again


---
Diffs of the changes:  (+20 -20)

 Pass.h        |   14 +++++++-------
 PassSupport.h |   26 +++++++++++++-------------
 2 files changed, 20 insertions(+), 20 deletions(-)


Index: llvm/include/llvm/Pass.h
diff -u llvm/include/llvm/Pass.h:1.87 llvm/include/llvm/Pass.h:1.88
--- llvm/include/llvm/Pass.h:1.87	Tue May  1 16:15:46 2007
+++ llvm/include/llvm/Pass.h	Tue May  1 23:25:30 2007
@@ -34,8 +34,8 @@
 #include 
 #include 
 #include 
+#include 
 #include 
-#include 
 
 namespace llvm {
 
@@ -77,7 +77,7 @@
 ///
 class Pass {
   AnalysisResolver *Resolver;  // Used to resolve analysis
-  intptr_t PassID;
+  const PassInfo *PassInfoCache;
 
   // AnalysisImpls - This keeps track of which passes implement the interfaces
   // that are required by the current pass (to implement getAnalysis()).
@@ -87,7 +87,7 @@
   void operator=(const Pass&);  // DO NOT IMPLEMENT
   Pass(const Pass &);           // DO NOT IMPLEMENT
 public:
-  Pass(intptr_t pid) : Resolver(0), PassID(pid) {}
+  Pass(intptr_t pid = 0) : Resolver(0), PassInfoCache(0) {}
   virtual ~Pass();
 
   /// getPassName - Return a nice clean name for a pass.  This usually
@@ -163,12 +163,12 @@
 
   template
   static const PassInfo *getClassPassInfo() {
-    return lookupPassInfo((intptr_t)&AnalysisClass::ID);
+    return lookupPassInfo(typeid(AnalysisClass));
   }
 
   // lookupPassInfo - Return the pass info object for the specified pass class,
   // or null if it is not known.
-  static const PassInfo *lookupPassInfo(intptr_t TI);
+  static const PassInfo *lookupPassInfo(const std::type_info &TI);
 
   /// getAnalysisToUpdate() - This function is used by subclasses
   /// to get to the analysis information that might be around that needs to be
@@ -274,7 +274,7 @@
 class FunctionPass : public Pass {
 public:
   FunctionPass(intptr_t pid) : Pass(pid) {}
-
+  
   /// doInitialization - Virtual method overridden by subclasses to do
   /// any necessary per-module initialization.
   ///
@@ -325,7 +325,7 @@
 class BasicBlockPass : public Pass {
 public:
   BasicBlockPass(intptr_t pid) : Pass(pid) {}
-
+  
   /// doInitialization - Virtual method overridden by subclasses to do
   /// any necessary per-module initialization.
   ///


Index: llvm/include/llvm/PassSupport.h
diff -u llvm/include/llvm/PassSupport.h:1.39 llvm/include/llvm/PassSupport.h:1.40
--- llvm/include/llvm/PassSupport.h:1.39	Tue May  1 16:15:46 2007
+++ llvm/include/llvm/PassSupport.h	Tue May  1 23:25:30 2007
@@ -37,19 +37,19 @@
 class PassInfo {
   const char           *PassName;      // Nice name for Pass
   const char           *PassArgument;  // Command Line argument to run this pass
-  intptr_t             PassID;      
+  const std::type_info &TypeInfo;      // type_info object for this Pass class
   bool IsCFGOnlyPass;                  // Pass only looks at the CFG.
   bool IsAnalysisGroup;                // True if an analysis group.
   std::vector ItfImpl;// Interfaces implemented by this pass
 
-  Pass *(*NormalCtor)();
+  Pass *(*NormalCtor)();               // No argument ctor
 
 public:
   /// PassInfo ctor - Do not call this directly, this should only be invoked
   /// through RegisterPass.
-  PassInfo(const char *name, const char *arg, intptr_t pi,
+  PassInfo(const char *name, const char *arg, const std::type_info &ti,
            Pass *(*normal)() = 0, bool isCFGOnly = false)
-    : PassName(name), PassArgument(arg), PassID(pi), 
+    : PassName(name), PassArgument(arg), TypeInfo(ti), 
       IsCFGOnlyPass(isCFGOnly), IsAnalysisGroup(false), NormalCtor(normal) {
   }
 
@@ -65,8 +65,8 @@
   const char *getPassArgument() const { return PassArgument; }
 
   /// getTypeInfo - Return the type_info object for the pass...
-  /// TODO : Rename
-  intptr_t getTypeInfo() const { return PassID; }
+  ///
+  const std::type_info &getTypeInfo() const { return TypeInfo; }
 
   /// isAnalysisGroup - Return true if this is an analysis group, not a normal
   /// pass.
@@ -139,12 +139,12 @@
 
   typedef Pass* (*NormalCtor_t)();
   
-  RegisterPassBase(const char *Name, const char *Arg, intptr_t TI,
+  RegisterPassBase(const char *Name, const char *Arg, const std::type_info &TI,
                    NormalCtor_t NormalCtor = 0, bool CFGOnly = false)
     : PIObj(Name, Arg, TI, NormalCtor, CFGOnly) {
     registerPass();
   }
-  RegisterPassBase(intptr_t TI)
+  RegisterPassBase(const std::type_info &TI)
     : PIObj("", "", TI) {
     // This ctor may only be used for analysis groups: it does not auto-register
     // the pass.
@@ -165,7 +165,7 @@
 
   // Register Pass using default constructor...
   RegisterPass(const char *PassArg, const char *Name, bool CFGOnly = false)
-    : RegisterPassBase(Name, PassArg, (intptr_t)&PassName::ID,
+  : RegisterPassBase(Name, PassArg, typeid(PassName),
                      (RegisterPassBase::NormalCtor_t)callDefaultCtor, CFGOnly) {
   }
 };
@@ -195,8 +195,8 @@
   const PassInfo *ImplementationInfo;
   bool isDefaultImplementation;
 protected:
-  explicit RegisterAGBase(intptr_t InterfaceID,
-                          intptr_t PassID = 0,
+  explicit RegisterAGBase(const std::type_info &Interface,
+                          const std::type_info *Pass = 0,
                           bool isDefault = false);
   void setGroupName(const char *Name);
 };
@@ -204,12 +204,12 @@
 template
 struct RegisterAnalysisGroup : public RegisterAGBase {
   explicit RegisterAnalysisGroup(RegisterPassBase &RPB)
-    : RegisterAGBase((intptr_t) &Interface::ID, RPB.getPassInfo()->getTypeInfo(),
+    : RegisterAGBase(typeid(Interface), &RPB.getPassInfo()->getTypeInfo(), 
                      Default) {
   }
 
   explicit RegisterAnalysisGroup(const char *Name)
-    : RegisterAGBase((intptr_t) &Interface::ID) {
+  : RegisterAGBase(typeid(Interface)) {
     setGroupName(Name);
   }
 };





From sabre at nondot.org  Tue May  1 23:25:54 2007
From: sabre at nondot.org (Chris Lattner)
Date: Tue, 1 May 2007 23:25:54 -0500
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Pass.cpp
Message-ID: <200705020425.l424Ps1o008872@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

Pass.cpp updated: 1.89 -> 1.90
---
Log message:

revert enough of devang's recent patches to get the tree basically working again


---
Diffs of the changes:  (+16 -15)

 Pass.cpp |   31 ++++++++++++++++---------------
 1 files changed, 16 insertions(+), 15 deletions(-)


Index: llvm/lib/VMCore/Pass.cpp
diff -u llvm/lib/VMCore/Pass.cpp:1.89 llvm/lib/VMCore/Pass.cpp:1.90
--- llvm/lib/VMCore/Pass.cpp:1.89	Tue May  1 23:01:44 2007
+++ llvm/lib/VMCore/Pass.cpp	Tue May  1 23:25:31 2007
@@ -133,7 +133,7 @@
 class PassRegistrar {
   /// PassInfoMap - Keep track of the passinfo object for each registered llvm
   /// pass.
-  std::map PassInfoMap;
+  std::map PassInfoMap;
   
   /// AnalysisGroupInfo - Keep track of information for each analysis group.
   struct AnalysisGroupInfo {
@@ -147,19 +147,19 @@
 
 public:
   
-  const PassInfo *GetPassInfo(intptr_t TI) const {
-    std::map::const_iterator I = PassInfoMap.find(TI);
+  const PassInfo *GetPassInfo(const std::type_info &TI) const {
+    std::map::const_iterator I = PassInfoMap.find(TI);
     return I != PassInfoMap.end() ? I->second : 0;
   }
   
   void RegisterPass(PassInfo &PI) {
     bool Inserted =
-      PassInfoMap.insert(std::make_pair(PI.getTypeInfo(),&PI)).second;
-    //assert(Inserted && "Pass registered multiple times!");
+      PassInfoMap.insert(std::make_pair(TypeInfo(PI.getTypeInfo()),&PI)).second;
+    assert(Inserted && "Pass registered multiple times!");
   }
   
   void UnregisterPass(PassInfo &PI) {
-    std::map::iterator I =
+    std::map::iterator I =
       PassInfoMap.find(PI.getTypeInfo());
     assert(I != PassInfoMap.end() && "Pass registered but not in map!");
     
@@ -168,7 +168,7 @@
   }
   
   void EnumerateWith(PassRegistrationListener *L) {
-    for (std::map::const_iterator I = PassInfoMap.begin(),
+    for (std::map::const_iterator I = PassInfoMap.begin(),
          E = PassInfoMap.end(); I != E; ++I)
       L->passEnumerate(I->second);
   }
@@ -210,10 +210,11 @@
 // getPassInfo - Return the PassInfo data structure that corresponds to this
 // pass...
 const PassInfo *Pass::getPassInfo() const {
-  return lookupPassInfo(PassID);
+  if (PassInfoCache) return PassInfoCache;
+  return lookupPassInfo(typeid(*this));
 }
 
-const PassInfo *Pass::lookupPassInfo(intptr_t TI) {
+const PassInfo *Pass::lookupPassInfo(const std::type_info &TI) {
   return getPassRegistrar()->GetPassInfo(TI);
 }
 
@@ -237,12 +238,12 @@
 
 // RegisterAGBase implementation
 //
-RegisterAGBase::RegisterAGBase(intptr_t InterfaceID,
-                               intptr_t PassID, bool isDefault)
-  : RegisterPassBase(InterfaceID),
+RegisterAGBase::RegisterAGBase(const std::type_info &Interface,
+                               const std::type_info *Pass, bool isDefault)
+  : RegisterPassBase(Interface),
     ImplementationInfo(0), isDefaultImplementation(isDefault) {
 
-  InterfaceInfo = const_cast(Pass::lookupPassInfo(InterfaceID));
+  InterfaceInfo = const_cast(Pass::lookupPassInfo(Interface));
   if (InterfaceInfo == 0) {
     // First reference to Interface, register it now.
     registerPass();
@@ -251,8 +252,8 @@
   assert(PIObj.isAnalysisGroup() &&
          "Trying to join an analysis group that is a normal pass!");
 
-  if (PassID) {
-    ImplementationInfo = Pass::lookupPassInfo(PassID);
+  if (Pass) {
+    ImplementationInfo = Pass::lookupPassInfo(*Pass);
     assert(ImplementationInfo &&
            "Must register pass before adding to AnalysisGroup!");
 





From sabre at nondot.org  Tue May  1 23:26:55 2007
From: sabre at nondot.org (Chris Lattner)
Date: Tue, 1 May 2007 23:26:55 -0500
Subject: [llvm-commits] CVS: llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
Message-ID: <200705020426.l424QtvF008942@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Bitcode/Writer:

BitcodeWriter.cpp updated: 1.19 -> 1.20
---
Log message:

use the correct code for binop instrs


---
Diffs of the changes:  (+1 -1)

 BitcodeWriter.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
diff -u llvm/lib/Bitcode/Writer/BitcodeWriter.cpp:1.19 llvm/lib/Bitcode/Writer/BitcodeWriter.cpp:1.20
--- llvm/lib/Bitcode/Writer/BitcodeWriter.cpp:1.19	Tue May  1 02:03:37 2007
+++ llvm/lib/Bitcode/Writer/BitcodeWriter.cpp	Tue May  1 23:26:36 2007
@@ -497,7 +497,7 @@
       Vals.push_back(VE.getValueID(I.getOperand(0)));
     } else {
       assert(isa(I) && "Unknown instruction!");
-      Code = bitc::CST_CODE_CE_BINOP;
+      Code = bitc::FUNC_CODE_INST_BINOP;
       Vals.push_back(GetEncodedBinaryOpcode(I.getOpcode()));
       Vals.push_back(VE.getTypeID(I.getType()));
       Vals.push_back(VE.getValueID(I.getOperand(0)));





From sabre at nondot.org  Tue May  1 23:27:44 2007
From: sabre at nondot.org (Chris Lattner)
Date: Tue, 1 May 2007 23:27:44 -0500
Subject: [llvm-commits] CVS: llvm/lib/Bitcode/Reader/BitcodeReader.cpp
Message-ID: <200705020427.l424Rigl009011@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Bitcode/Reader:

BitcodeReader.cpp updated: 1.21 -> 1.22
---
Log message:

read a few instructions, fix some bugs.  This is enough to be able to round
trip function bodies like this:

define <2 x i64> @foo(<2 x i64> %x, <2 x i64> %y) {
        %tmp4 = bitcast <2 x i64> %y to <8 x i16>               ; <<8 x i16>> [#uses=1]
        %tmp5 = bitcast <2 x i64> %x to <8 x i16>               ; <<8 x i16>> [#uses=1]
        %tmp = add <8 x i16> %tmp5, %tmp4               ; <<8 x i16>> [#uses=1]
        %tmp6 = bitcast <8 x i16> %tmp to <2 x i64>             ; <<2 x i64>> [#uses=1]
        ret <2 x i64> %tmp6
}



---
Diffs of the changes:  (+38 -15)

 BitcodeReader.cpp |   53 ++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 38 insertions(+), 15 deletions(-)


Index: llvm/lib/Bitcode/Reader/BitcodeReader.cpp
diff -u llvm/lib/Bitcode/Reader/BitcodeReader.cpp:1.21 llvm/lib/Bitcode/Reader/BitcodeReader.cpp:1.22
--- llvm/lib/Bitcode/Reader/BitcodeReader.cpp:1.21	Tue May  1 02:01:57 2007
+++ llvm/lib/Bitcode/Reader/BitcodeReader.cpp	Tue May  1 23:27:25 2007
@@ -1006,7 +1006,9 @@
     ValueList.push_back(I);
   
   unsigned NextValueNo = ValueList.size();
-  
+  BasicBlock *CurBB = 0;
+  unsigned CurBBNo = 0;
+
   // Read all the records.
   SmallVector Record;
   while (1) {
@@ -1042,8 +1044,6 @@
     // Read a record.
     Record.clear();
     Instruction *I = 0;
-    BasicBlock *CurBB = 0;
-    unsigned CurBBNo = 0;
     switch (Stream.ReadRecord(Code, Record)) {
     default: // Default behavior: reject
       return Error("Unknown instruction");
@@ -1057,8 +1057,7 @@
       CurBB = FunctionBBs[0];
       continue;
       
-    case bitc::FUNC_CODE_INST_BINOP: {
-      // BINOP:      [opcode, ty, opval, opval]
+    case bitc::FUNC_CODE_INST_BINOP: {    // BINOP: [opcode, ty, opval, opval]
       if (Record.size() < 4) return Error("Invalid BINOP record");
       const Type *Ty = getTypeByID(Record[1]);
       int Opc = GetDecodedBinaryOpcode(Record[0], Ty);
@@ -1069,9 +1068,18 @@
       I = BinaryOperator::create((Instruction::BinaryOps)Opc, LHS, RHS);
       break;
     }
+    case bitc::FUNC_CODE_INST_CAST: {    // CAST: [opcode, ty, opty, opval]
+      if (Record.size() < 4) return Error("Invalid CAST record");
+      int Opc = GetDecodedCastOpcode(Record[0]);
+      const Type *ResTy = getTypeByID(Record[1]);
+      const Type *OpTy = getTypeByID(Record[2]);
+      Value *Op = getFnValueByID(Record[3], OpTy);
+      if (Opc == -1 || ResTy == 0 || OpTy == 0 || Op == 0)
+        return Error("Invalid CAST record");
+      I = CastInst::create((Instruction::CastOps)Opc, Op, ResTy);
+      break;
+    }
 #if 0
-    case bitc::FUNC_CODE_INST_CAST:
-      // CAST:       [opcode, ty, opty, opval]
     case bitc::FUNC_CODE_INST_GEP:
       // GEP:        [n, n x operands]
     case bitc::FUNC_CODE_INST_SELECT:
@@ -1084,20 +1092,35 @@
       // SHUFFLEVEC: [ty, opval, opval, opval]
     case bitc::FUNC_CODE_INST_CMP:
       // CMP:        [opty, opval, opval, pred]
-        
-    case bitc::FUNC_CODE_INST_RET:
-      // RET:        [opty,opval]
+#endif
+      
+    case bitc::FUNC_CODE_INST_RET: // RET: [opty,opval]
+      if (Record.size() == 0) {
+        I = new ReturnInst();
+        break;
+      }
+      if (Record.size() == 2) {
+        const Type *OpTy = getTypeByID(Record[0]);
+        Value *Op = getFnValueByID(Record[1], OpTy);
+        if (OpTy && Op);
+        I = new ReturnInst(Op);
+        break;
+      }
+      return Error("Invalid RET record");
+#if 0
     case bitc::FUNC_CODE_INST_BR:
       // BR:         [opval, bb#, bb#] or [bb#]
     case bitc::FUNC_CODE_INST_SWITCH:
       // SWITCH:     [opty, opval, n, n x ops]
     case bitc::FUNC_CODE_INST_INVOKE:
       // INVOKE:     [fnty, op0,op1,op2, ...]
-    case bitc::FUNC_CODE_INST_UNWIND:
-      // UNWIND
-    case bitc::FUNC_CODE_INST_UNREACHABLE:
-      // UNREACHABLE
-        
+    case bitc::FUNC_CODE_INST_UNWIND: // UNWIND
+      I = new UnwindInst();
+      break;
+    case bitc::FUNC_CODE_INST_UNREACHABLE: // UNREACHABLE
+      I = new UnreachableInst();
+      break;
+
     case bitc::FUNC_CODE_INST_PHI:
       // PHI:        [ty, #ops, val0,bb0, ...]
     case bitc::FUNC_CODE_INST_MALLOC:





From sabre at nondot.org  Wed May  2 00:17:07 2007
From: sabre at nondot.org (Chris Lattner)
Date: Wed, 2 May 2007 00:17:07 -0500
Subject: [llvm-commits] CVS: llvm/lib/Bitcode/Reader/BitcodeReader.cpp
Message-ID: <200705020517.l425H7Op009854@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Bitcode/Reader:

BitcodeReader.cpp updated: 1.22 -> 1.23
---
Log message:

add reader support for a bunch of new instructions


---
Diffs of the changes:  (+90 -14)

 BitcodeReader.cpp |  104 ++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 90 insertions(+), 14 deletions(-)


Index: llvm/lib/Bitcode/Reader/BitcodeReader.cpp
diff -u llvm/lib/Bitcode/Reader/BitcodeReader.cpp:1.22 llvm/lib/Bitcode/Reader/BitcodeReader.cpp:1.23
--- llvm/lib/Bitcode/Reader/BitcodeReader.cpp:1.22	Tue May  1 23:27:25 2007
+++ llvm/lib/Bitcode/Reader/BitcodeReader.cpp	Wed May  2 00:16:49 2007
@@ -150,6 +150,9 @@
     return V;
   }
   
+  // No type specified, must be invalid reference.
+  if (Ty == 0) return 0;
+  
   // Create and return a placeholder, which will later be RAUW'd.
   Value *V = new Argument(Ty);
   Uses[Idx].init(V, this);
@@ -1079,21 +1082,94 @@
       I = CastInst::create((Instruction::CastOps)Opc, Op, ResTy);
       break;
     }
-#if 0
-    case bitc::FUNC_CODE_INST_GEP:
-      // GEP:        [n, n x operands]
-    case bitc::FUNC_CODE_INST_SELECT:
-      // SELECT:     [ty, opval, opval, opval]
-    case bitc::FUNC_CODE_INST_EXTRACTELT:
-      // EXTRACTELT: [opty, opval, opval]
-    case bitc::FUNC_CODE_INST_INSERTELT:
-      // INSERTELT:  [ty, opval, opval, opval]
-    case bitc::FUNC_CODE_INST_SHUFFLEVEC:
-      // SHUFFLEVEC: [ty, opval, opval, opval]
-    case bitc::FUNC_CODE_INST_CMP:
-      // CMP:        [opty, opval, opval, pred]
-#endif
+    case bitc::FUNC_CODE_INST_GEP: { // GEP: [n, n x operands]
+      if (Record.size() < 2 || (Record.size() & 1))
+        return Error("Invalid GEP record");
+      const Type *OpTy = getTypeByID(Record[0]);
+      Value *Op = getFnValueByID(Record[1], OpTy);
+      if (OpTy == 0 || Op == 0)
+        return Error("Invalid GEP record");
+
+      SmallVector GEPIdx;
+      for (unsigned i = 1, e = Record.size()/2; i != e; ++i) {
+        const Type *IdxTy = getTypeByID(Record[i*2]);
+        Value *Idx = getFnValueByID(Record[i*2+1], IdxTy);
+        if (IdxTy == 0 || Idx == 0)
+          return Error("Invalid GEP record");
+        GEPIdx.push_back(Idx);
+      }
+
+      I = new GetElementPtrInst(Op, &GEPIdx[0], GEPIdx.size());
+      break;
+    }
       
+    case bitc::FUNC_CODE_INST_SELECT: { // SELECT: [ty, opval, opval, opval]
+      if (Record.size() < 4) return Error("Invalid SELECT record");
+      const Type *Ty = getTypeByID(Record[0]);
+      Value *Cond = getFnValueByID(Record[1], Type::Int1Ty);
+      Value *LHS = getFnValueByID(Record[2], Ty);
+      Value *RHS = getFnValueByID(Record[3], Ty);
+      if (Ty == 0 || Cond == 0 || LHS == 0 || RHS == 0)
+        return Error("Invalid SELECT record");
+      I = new SelectInst(Cond, LHS, RHS);
+      break;
+    }
+      
+    case bitc::FUNC_CODE_INST_EXTRACTELT: { // EXTRACTELT: [opty, opval, opval]
+      if (Record.size() < 3) return Error("Invalid EXTRACTELT record");
+      const Type *OpTy = getTypeByID(Record[0]);
+      Value *Vec = getFnValueByID(Record[1], OpTy);
+      Value *Idx = getFnValueByID(Record[2], Type::Int32Ty);
+      if (OpTy == 0 || Vec == 0 || Idx == 0)
+        return Error("Invalid EXTRACTELT record");
+      I = new ExtractElementInst(Vec, Idx);
+      break;
+    }
+      
+    case bitc::FUNC_CODE_INST_INSERTELT: { // INSERTELT: [ty, opval,opval,opval]
+      if (Record.size() < 4) return Error("Invalid INSERTELT record");
+      const VectorType *OpTy = 
+        dyn_cast_or_null(getTypeByID(Record[0]));
+      if (OpTy == 0) return Error("Invalid INSERTELT record");
+      Value *Vec = getFnValueByID(Record[1], OpTy);
+      Value *Elt = getFnValueByID(Record[2], OpTy->getElementType());
+      Value *Idx = getFnValueByID(Record[3], Type::Int32Ty);
+      if (Vec == 0 || Elt == 0 || Idx == 0)
+        return Error("Invalid INSERTELT record");
+      I = new InsertElementInst(Vec, Elt, Idx);
+      break;
+    }
+      
+    case bitc::FUNC_CODE_INST_SHUFFLEVEC: {// SHUFFLEVEC: [ty,opval,opval,opval]
+      if (Record.size() < 4) return Error("Invalid SHUFFLEVEC record");
+      const VectorType *OpTy = 
+        dyn_cast_or_null(getTypeByID(Record[0]));
+      if (OpTy == 0) return Error("Invalid SHUFFLEVEC record");
+      Value *Vec1 = getFnValueByID(Record[1], OpTy);
+      Value *Vec2 = getFnValueByID(Record[2], OpTy);
+      Value *Mask = getFnValueByID(Record[3],
+                                   VectorType::get(Type::Int32Ty,
+                                                   OpTy->getNumElements()));
+      if (Vec1 == 0 || Vec2 == 0 || Mask == 0)
+        return Error("Invalid SHUFFLEVEC record");
+      I = new ShuffleVectorInst(Vec1, Vec2, Mask);
+      break;
+    }
+      
+    case bitc::FUNC_CODE_INST_CMP: { // CMP: [opty, opval, opval, pred]
+      if (Record.size() < 4) return Error("Invalid CMP record");
+      const Type *OpTy = getTypeByID(Record[0]);
+      Value *LHS = getFnValueByID(Record[1], OpTy);
+      Value *RHS = getFnValueByID(Record[2], OpTy);
+      if (OpTy == 0 || LHS == 0 || RHS == 0)
+        return Error("Invalid CMP record");
+      if (OpTy->isFPOrFPVector())
+        I = new FCmpInst((FCmpInst::Predicate)Record[3], LHS, RHS);
+      else
+        I = new ICmpInst((ICmpInst::Predicate)Record[3], LHS, RHS);
+      break;
+    }
+    
     case bitc::FUNC_CODE_INST_RET: // RET: [opty,opval]
       if (Record.size() == 0) {
         I = new ReturnInst();





From sabre at nondot.org  Wed May  2 00:47:09 2007
From: sabre at nondot.org (Chris Lattner)
Date: Wed, 2 May 2007 00:47:09 -0500
Subject: [llvm-commits] CVS: llvm/lib/Bitcode/Reader/BitcodeReader.cpp
	BitcodeReader.h
Message-ID: <200705020547.l425l9im010458@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Bitcode/Reader:

BitcodeReader.cpp updated: 1.23 -> 1.24
BitcodeReader.h updated: 1.15 -> 1.16
---
Log message:

add reader logic for terminator instrs.


---
Diffs of the changes:  (+93 -8)

 BitcodeReader.cpp |   97 +++++++++++++++++++++++++++++++++++++++++++++++++-----
 BitcodeReader.h   |    4 ++
 2 files changed, 93 insertions(+), 8 deletions(-)


Index: llvm/lib/Bitcode/Reader/BitcodeReader.cpp
diff -u llvm/lib/Bitcode/Reader/BitcodeReader.cpp:1.23 llvm/lib/Bitcode/Reader/BitcodeReader.cpp:1.24
--- llvm/lib/Bitcode/Reader/BitcodeReader.cpp:1.23	Wed May  2 00:16:49 2007
+++ llvm/lib/Bitcode/Reader/BitcodeReader.cpp	Wed May  2 00:46:45 2007
@@ -1090,7 +1090,7 @@
       if (OpTy == 0 || Op == 0)
         return Error("Invalid GEP record");
 
-      SmallVector GEPIdx;
+      SmallVector GEPIdx;
       for (unsigned i = 1, e = Record.size()/2; i != e; ++i) {
         const Type *IdxTy = getTypeByID(Record[i*2]);
         Value *Idx = getFnValueByID(Record[i*2+1], IdxTy);
@@ -1183,19 +1183,100 @@
         break;
       }
       return Error("Invalid RET record");
-#if 0
-    case bitc::FUNC_CODE_INST_BR:
-      // BR:         [opval, bb#, bb#] or [bb#]
-    case bitc::FUNC_CODE_INST_SWITCH:
-      // SWITCH:     [opty, opval, n, n x ops]
-    case bitc::FUNC_CODE_INST_INVOKE:
-      // INVOKE:     [fnty, op0,op1,op2, ...]
+    case bitc::FUNC_CODE_INST_BR: { // BR: [bb#, bb#, opval] or [bb#]
+      if (Record.size() != 1 || Record.size() != 3)
+        return Error("Invalid BR record");
+      BasicBlock *TrueDest = getBasicBlock(Record[0]);
+      if (TrueDest == 0)
+        return Error("Invalid BR record");
+
+      if (Record.size() == 1)
+        I = new BranchInst(TrueDest);
+      else {
+        BasicBlock *FalseDest = getBasicBlock(Record[1]);
+        Value *Cond = getFnValueByID(Record[2], Type::Int1Ty);
+        if (FalseDest == 0 || Cond == 0)
+          return Error("Invalid BR record");
+        I = new BranchInst(TrueDest, FalseDest, Cond);
+      }
+      break;
+    }
+    case bitc::FUNC_CODE_INST_SWITCH: { // SWITCH: [opty, opval, n, n x ops]
+      if (Record.size() < 3 || (Record.size() & 1) == 0)
+        return Error("Invalid SWITCH record");
+      const Type *OpTy = getTypeByID(Record[0]);
+      Value *Cond = getFnValueByID(Record[1], OpTy);
+      BasicBlock *Default = getBasicBlock(Record[2]);
+      if (OpTy == 0 || Cond == 0 || Default == 0)
+        return Error("Invalid SWITCH record");
+      unsigned NumCases = (Record.size()-3)/2;
+      SwitchInst *SI = new SwitchInst(Cond, Default, NumCases);
+      for (unsigned i = 0, e = NumCases; i != e; ++i) {
+        ConstantInt *CaseVal = 
+          dyn_cast_or_null(getFnValueByID(Record[3+i*2], OpTy));
+        BasicBlock *DestBB = getBasicBlock(Record[1+3+i*2]);
+        if (CaseVal == 0 || DestBB == 0) {
+          delete SI;
+          return Error("Invalid SWITCH record!");
+        }
+        SI->addCase(CaseVal, DestBB);
+      }
+      I = SI;
+      break;
+    }
+      
+    case bitc::FUNC_CODE_INST_INVOKE: { // INVOKE: [fnty, op0,op1,op2, ...]
+      if (Record.size() < 4)
+        return Error("Invalid INVOKE record");
+      const PointerType *CalleeTy =
+        dyn_cast_or_null(getTypeByID(Record[0]));
+      Value *Callee = getFnValueByID(Record[1], CalleeTy);
+      BasicBlock *NormalBB = getBasicBlock(Record[2]);
+      BasicBlock *UnwindBB = getBasicBlock(Record[3]);
+      if (CalleeTy == 0 || Callee == 0 || NormalBB == 0 || UnwindBB == 0)
+        return Error("Invalid INVOKE record");
+      
+      const FunctionType *FTy =
+        dyn_cast(CalleeTy->getElementType());
+
+      // Check that the right number of fixed parameters are here.
+      if (FTy == 0 || Record.size() < 4+FTy->getNumParams())
+        return Error("Invalid INVOKE record");
+
+      SmallVector Ops;
+      for (unsigned i = 0, e = FTy->getNumParams(); i != e; ++i) {
+        Ops.push_back(getFnValueByID(Record[4+i], FTy->getParamType(4+i)));
+        if (Ops.back() == 0)
+          return Error("Invalid INVOKE record");
+      }
+      
+      unsigned FirstVarargParam = 4+FTy->getNumParams();
+      if (FTy->isVarArg()) {
+        // Read type/value pairs for varargs params.
+        if ((Record.size()-FirstVarargParam) & 1)
+          return Error("Invalid INVOKE record");
+        
+        for (unsigned i = FirstVarargParam, e = Record.size(); i != e; i += 2) {
+          const Type *ArgTy = getTypeByID(Record[i]);
+          Ops.push_back(getFnValueByID(Record[i+1], ArgTy));
+          if (Ops.back() == 0 || ArgTy == 0)
+            return Error("Invalid INVOKE record");
+        }
+      } else {
+        if (Record.size() != FirstVarargParam)
+          return Error("Invalid INVOKE record");
+      }
+      
+      I = new InvokeInst(Callee, NormalBB, UnwindBB, &Ops[0], Ops.size());
+      break;
+    }
     case bitc::FUNC_CODE_INST_UNWIND: // UNWIND
       I = new UnwindInst();
       break;
     case bitc::FUNC_CODE_INST_UNREACHABLE: // UNREACHABLE
       I = new UnreachableInst();
       break;
+#if 0
 
     case bitc::FUNC_CODE_INST_PHI:
       // PHI:        [ty, #ops, val0,bb0, ...]


Index: llvm/lib/Bitcode/Reader/BitcodeReader.h
diff -u llvm/lib/Bitcode/Reader/BitcodeReader.h:1.15 llvm/lib/Bitcode/Reader/BitcodeReader.h:1.16
--- llvm/lib/Bitcode/Reader/BitcodeReader.h:1.15	Tue May  1 02:01:57 2007
+++ llvm/lib/Bitcode/Reader/BitcodeReader.h	Wed May  2 00:46:45 2007
@@ -132,6 +132,10 @@
   Value *getFnValueByID(unsigned ID, const Type *Ty) {
     return ValueList.getValueFwdRef(ID, Ty);
   }
+  BasicBlock *getBasicBlock(unsigned ID) const {
+    if (ID >= FunctionBBs.size()) return 0; // Invalid ID
+    return FunctionBBs[ID];
+  }
   
   bool ParseModule(const std::string &ModuleID);
   bool ParseTypeTable();





From sabre at nondot.org  Wed May  2 00:47:09 2007
From: sabre at nondot.org (Chris Lattner)
Date: Wed, 2 May 2007 00:47:09 -0500
Subject: [llvm-commits] CVS: llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
Message-ID: <200705020547.l425l9Ep010463@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Bitcode/Writer:

BitcodeWriter.cpp updated: 1.20 -> 1.21
---
Log message:

add reader logic for terminator instrs.


---
Diffs of the changes:  (+0 -2)

 BitcodeWriter.cpp |    2 --
 1 files changed, 2 deletions(-)


Index: llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
diff -u llvm/lib/Bitcode/Writer/BitcodeWriter.cpp:1.20 llvm/lib/Bitcode/Writer/BitcodeWriter.cpp:1.21
--- llvm/lib/Bitcode/Writer/BitcodeWriter.cpp:1.20	Tue May  1 23:26:36 2007
+++ llvm/lib/Bitcode/Writer/BitcodeWriter.cpp	Wed May  2 00:46:45 2007
@@ -507,7 +507,6 @@
 
   case Instruction::GetElementPtr:
     Code = bitc::FUNC_CODE_INST_GEP;
-    Vals.push_back(I.getNumOperands());
     for (unsigned i = 0, e = I.getNumOperands(); i != e; ++i) {
       Vals.push_back(VE.getTypeID(I.getOperand(i)->getType()));
       Vals.push_back(VE.getValueID(I.getOperand(i)));
@@ -567,7 +566,6 @@
   case Instruction::Switch:
     Code = bitc::FUNC_CODE_INST_SWITCH;
     Vals.push_back(VE.getTypeID(I.getOperand(0)->getType()));
-    Vals.push_back(I.getNumOperands());
     for (unsigned i = 0, e = I.getNumOperands(); i != e; ++i)
       Vals.push_back(VE.getValueID(I.getOperand(i)));
     break;





From sabre at nondot.org  Wed May  2 00:47:42 2007
From: sabre at nondot.org (Chris Lattner)
Date: Wed, 2 May 2007 00:47:42 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Bitcode/LLVMBitCodes.h
Message-ID: <200705020547.l425lgf0010505@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Bitcode:

LLVMBitCodes.h updated: 1.10 -> 1.11
---
Log message:

update to reflect reality


---
Diffs of the changes:  (+1 -1)

 LLVMBitCodes.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/include/llvm/Bitcode/LLVMBitCodes.h
diff -u llvm/include/llvm/Bitcode/LLVMBitCodes.h:1.10 llvm/include/llvm/Bitcode/LLVMBitCodes.h:1.11
--- llvm/include/llvm/Bitcode/LLVMBitCodes.h:1.10	Mon Apr 30 21:12:05 2007
+++ llvm/include/llvm/Bitcode/LLVMBitCodes.h	Wed May  2 00:47:22 2007
@@ -165,7 +165,7 @@
     FUNC_CODE_INST_CMP         =  9, // CMP:        [opty, opval, opval, pred]
     
     FUNC_CODE_INST_RET         = 10, // RET:        [opty,opval]
-    FUNC_CODE_INST_BR          = 11, // BR:         [opval, bb#, bb#] or [bb#]
+    FUNC_CODE_INST_BR          = 11, // BR:         [bb#, bb#, cond] or [bb#]
     FUNC_CODE_INST_SWITCH      = 12, // SWITCH:     [opty, opval, n, n x ops]
     FUNC_CODE_INST_INVOKE      = 13, // INVOKE:     [fnty, op0,op1,op2, ...]
     FUNC_CODE_INST_UNWIND      = 14, // UNWIND





From clattner at apple.com  Wed May  2 00:50:00 2007
From: clattner at apple.com (Chris Lattner)
Date: Tue, 1 May 2007 22:50:00 -0700
Subject: [llvm-commits] CVS: llvm/utils/TableGen/RegisterInfoEmitter.cpp
In-Reply-To: <74F07314-F0B2-469B-8BEE-4DF28A2D9677@mac.com>
References: <200705010557.l415vb52005240@zion.cs.uiuc.edu>
	
	<74F07314-F0B2-469B-8BEE-4DF28A2D9677@mac.com>
Message-ID: <52AE163D-4EDC-4A25-A5D1-993AB0752596@apple.com>


On May 1, 2007, at 1:28 PM, Nate Begeman wrote:

>> I believe that sub/super register generator unions the set of sub/
>> super registers in a deterministic fashion and produces the
>> necessary tables in the RegisterInfo.inc already. The only thing is
>> that this would make the sub register index implicit in the
>> ordering of the sub register list in the RegisterInfo.td.
>
> I'm not sure things are sufficiently well ordered internally for
> that, or sorted in any particular fashion.  I'll look into it, but it
> seems like it would be less flexible and make the td files far less
> intuitive as to what is actually going on.  If tablegen picked the
> numbering, I would have to go read the generated file to know what to
> write in the ISel for that backend, which seems backwards to me.

I agree with both of you.  We should have the subreg number in  
the .td file, but we should merge this with the existing subreg stuff  
if possible.  One simple thing would be for nates new syntax to  
populate the old tables, making the old syntax unneeded?

-Chris


From baldrick at free.fr  Wed May  2 02:41:52 2007
From: baldrick at free.fr (Duncan Sands)
Date: Wed, 2 May 2007 02:41:52 -0500
Subject: [llvm-commits] CVS: llvm/test/FrontendAda/asm.adb
Message-ID: <200705020741.l427fqIC021478@zion.cs.uiuc.edu>



Changes in directory llvm/test/FrontendAda:

asm.adb added (r1.1)
---
Log message:

Test that inline assembler compiles (llvm-gcc added an extra "uses" parameter
to ASM_EXPR).


---
Diffs of the changes:  (+6 -0)

 asm.adb |    6 ++++++
 1 files changed, 6 insertions(+)


Index: llvm/test/FrontendAda/asm.adb
diff -c /dev/null llvm/test/FrontendAda/asm.adb:1.1
*** /dev/null	Wed May  2 02:41:32 2007
--- llvm/test/FrontendAda/asm.adb	Wed May  2 02:41:22 2007
***************
*** 0 ****
--- 1,6 ----
+ -- RUN: %llvmgcc -c %s -o /dev/null
+ with System.Machine_Code;
+ procedure Asm is
+ begin
+    System.Machine_Code.Asm ("");
+ end;





From baldrick at free.fr  Wed May  2 02:43:33 2007
From: baldrick at free.fr (Duncan Sands)
Date: Wed, 2 May 2007 02:43:33 -0500
Subject: [llvm-commits] CVS: llvm/test/FrontendAda/unc_constructor.adb
	unc_constructor.ads
Message-ID: <200705020743.l427hXQ8021515@zion.cs.uiuc.edu>



Changes in directory llvm/test/FrontendAda:

unc_constructor.adb added (r1.1)
unc_constructor.ads added (r1.1)
---
Log message:

Test that TREE_CONSTANT is being set correctly.


---
Diffs of the changes:  (+17 -0)

 unc_constructor.adb |    9 +++++++++
 unc_constructor.ads |    8 ++++++++
 2 files changed, 17 insertions(+)


Index: llvm/test/FrontendAda/unc_constructor.adb
diff -c /dev/null llvm/test/FrontendAda/unc_constructor.adb:1.1
*** /dev/null	Wed May  2 02:43:24 2007
--- llvm/test/FrontendAda/unc_constructor.adb	Wed May  2 02:43:14 2007
***************
*** 0 ****
--- 1,9 ----
+ -- RUN: %llvmgcc -c %s -o /dev/null
+ package body Unc_Constructor is
+    procedure P (X : A) is
+    begin
+       if X = A0 then
+          null;
+       end if;
+    end;
+ end;


Index: llvm/test/FrontendAda/unc_constructor.ads
diff -c /dev/null llvm/test/FrontendAda/unc_constructor.ads:1.1
*** /dev/null	Wed May  2 02:43:33 2007
--- llvm/test/FrontendAda/unc_constructor.ads	Wed May  2 02:43:14 2007
***************
*** 0 ****
--- 1,8 ----
+ package Unc_Constructor is
+    type C is null record;
+    type A is array (Positive range <>) of C;
+    A0 : constant A;
+    procedure P (X : A);
+ private
+    A0 : aliased constant A := (1 .. 0 => (null record));
+ end;





From asl at math.spbu.ru  Wed May  2 03:46:20 2007
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 2 May 2007 03:46:20 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86RegisterInfo.cpp
	X86RegisterInfo.td
Message-ID: <200705020846.l428kK3X022648@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

X86RegisterInfo.cpp updated: 1.217 -> 1.218
X86RegisterInfo.td updated: 1.42 -> 1.43
---
Log message:

Emit correct DWARF reg # for RA (return address) register


---
Diffs of the changes:  (+7 -1)

 X86RegisterInfo.cpp |    5 ++++-
 X86RegisterInfo.td  |    3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)


Index: llvm/lib/Target/X86/X86RegisterInfo.cpp
diff -u llvm/lib/Target/X86/X86RegisterInfo.cpp:1.217 llvm/lib/Target/X86/X86RegisterInfo.cpp:1.218
--- llvm/lib/Target/X86/X86RegisterInfo.cpp:1.217	Tue May  1 04:13:03 2007
+++ llvm/lib/Target/X86/X86RegisterInfo.cpp	Wed May  2 03:46:03 2007
@@ -1235,7 +1235,10 @@
 }
 
 unsigned X86RegisterInfo::getRARegister() const {
-  return X86::ST0;  // use a non-register register
+  if (Is64Bit)
+    return X86::RIP;  // Should have dwarf #16
+  else
+    return X86::EIP;  // Should have dwarf #8
 }
 
 unsigned X86RegisterInfo::getFrameRegister(MachineFunction &MF) const {


Index: llvm/lib/Target/X86/X86RegisterInfo.td
diff -u llvm/lib/Target/X86/X86RegisterInfo.td:1.42 llvm/lib/Target/X86/X86RegisterInfo.td:1.43
--- llvm/lib/Target/X86/X86RegisterInfo.td:1.42	Fri Apr 20 16:15:21 2007
+++ llvm/lib/Target/X86/X86RegisterInfo.td	Wed May  2 03:46:03 2007
@@ -60,6 +60,7 @@
   def BP : RegisterWithSubRegs<"BP", [BPL]>, DwarfRegNum<5>;
   def SI : RegisterWithSubRegs<"SI", [SIL]>, DwarfRegNum<6>;
   def DI : RegisterWithSubRegs<"DI", [DIL]>, DwarfRegNum<7>;
+  def IP : Register<"IP">, DwarfRegNum<8>;  
   
   // X86-64 only
   def R8W  : RegisterWithSubRegs<"R8W", [R8B]>, DwarfRegNum<8>;
@@ -80,6 +81,7 @@
   def EBP : RegisterWithSubRegs<"EBP", [BP]>, DwarfRegNum<5>;
   def ESI : RegisterWithSubRegs<"ESI", [SI]>, DwarfRegNum<6>;
   def EDI : RegisterWithSubRegs<"EDI", [DI]>, DwarfRegNum<7>;
+  def EIP : RegisterWithSubRegs<"EIP", [IP]>, DwarfRegNum<8>;  
   
   // X86-64 only
   def R8D  : RegisterWithSubRegs<"R8D", [R8W]>, DwarfRegNum<8>;
@@ -109,6 +111,7 @@
   def R13 : RegisterWithSubRegs<"R13", [R13D]>, DwarfRegNum<13>;
   def R14 : RegisterWithSubRegs<"R14", [R14D]>, DwarfRegNum<14>;
   def R15 : RegisterWithSubRegs<"R15", [R15D]>, DwarfRegNum<15>;
+  def RIP : RegisterWithSubRegs<"RIP", [EIP]>,  DwarfRegNum<16>;
 
   // MMX Registers. These are actually aliased to ST0 .. ST7
   def MM0 : Register<"MM0">, DwarfRegNum<29>;





From jlh at gmx.ch  Wed May  2 10:57:58 2007
From: jlh at gmx.ch (jlh)
Date: Wed, 02 May 2007 17:57:58 +0200
Subject: [llvm-commits] Patch for bug in llvm-ld
In-Reply-To: 
References: <4635F312.5040301@gmx.ch>
	
Message-ID: <4638B506.7040304@gmx.ch>

Chris Lattner wrote:
> Thanks, but this doesn't seem safe.  If the args_temp vector is
> reallocated, it will move all the std::string objects, invalidating the
> pointers.

Right, I wasn't thinking enough.  One solution would be to use
std::list instead.  But anyway, I only wanted to point out the
problem.  Fix it the way you think is best.

jlh


From evan.cheng at apple.com  Wed May  2 13:05:17 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Wed, 2 May 2007 11:05:17 -0700
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86RegisterInfo.cpp
	X86RegisterInfo.td
In-Reply-To: <200705020846.l428kK3X022648@zion.cs.uiuc.edu>
References: <200705020846.l428kK3X022648@zion.cs.uiuc.edu>
Message-ID: <965F198C-3210-444B-BC84-2268EE81B36C@apple.com>

Anton, I believe different OS / target / DWARF imeplementations  
assign different DWARF numbers to register. On Mac OS X, I am fairly  
certain x86 and x86-64 assign different numbers. :-(  We need a  
better way to handle this.

Evan

On May 2, 2007, at 1:46 AM, Anton Korobeynikov wrote:

>
>
> Changes in directory llvm/lib/Target/X86:
>
> X86RegisterInfo.cpp updated: 1.217 -> 1.218
> X86RegisterInfo.td updated: 1.42 -> 1.43
> ---
> Log message:
>
> Emit correct DWARF reg # for RA (return address) register
>
>
> ---
> Diffs of the changes:  (+7 -1)
>
>  X86RegisterInfo.cpp |    5 ++++-
>  X86RegisterInfo.td  |    3 +++
>  2 files changed, 7 insertions(+), 1 deletion(-)
>
>
> Index: llvm/lib/Target/X86/X86RegisterInfo.cpp
> diff -u llvm/lib/Target/X86/X86RegisterInfo.cpp:1.217 llvm/lib/ 
> Target/X86/X86RegisterInfo.cpp:1.218
> --- llvm/lib/Target/X86/X86RegisterInfo.cpp:1.217	Tue May  1  
> 04:13:03 2007
> +++ llvm/lib/Target/X86/X86RegisterInfo.cpp	Wed May  2 03:46:03 2007
> @@ -1235,7 +1235,10 @@
>  }
>
>  unsigned X86RegisterInfo::getRARegister() const {
> -  return X86::ST0;  // use a non-register register
> +  if (Is64Bit)
> +    return X86::RIP;  // Should have dwarf #16
> +  else
> +    return X86::EIP;  // Should have dwarf #8
>  }
>
>  unsigned X86RegisterInfo::getFrameRegister(MachineFunction &MF)  
> const {
>
>
> Index: llvm/lib/Target/X86/X86RegisterInfo.td
> diff -u llvm/lib/Target/X86/X86RegisterInfo.td:1.42 llvm/lib/Target/ 
> X86/X86RegisterInfo.td:1.43
> --- llvm/lib/Target/X86/X86RegisterInfo.td:1.42	Fri Apr 20 16:15:21  
> 2007
> +++ llvm/lib/Target/X86/X86RegisterInfo.td	Wed May  2 03:46:03 2007
> @@ -60,6 +60,7 @@
>    def BP : RegisterWithSubRegs<"BP", [BPL]>, DwarfRegNum<5>;
>    def SI : RegisterWithSubRegs<"SI", [SIL]>, DwarfRegNum<6>;
>    def DI : RegisterWithSubRegs<"DI", [DIL]>, DwarfRegNum<7>;
> +  def IP : Register<"IP">, DwarfRegNum<8>;
>
>    // X86-64 only
>    def R8W  : RegisterWithSubRegs<"R8W", [R8B]>, DwarfRegNum<8>;
> @@ -80,6 +81,7 @@
>    def EBP : RegisterWithSubRegs<"EBP", [BP]>, DwarfRegNum<5>;
>    def ESI : RegisterWithSubRegs<"ESI", [SI]>, DwarfRegNum<6>;
>    def EDI : RegisterWithSubRegs<"EDI", [DI]>, DwarfRegNum<7>;
> +  def EIP : RegisterWithSubRegs<"EIP", [IP]>, DwarfRegNum<8>;
>
>    // X86-64 only
>    def R8D  : RegisterWithSubRegs<"R8D", [R8W]>, DwarfRegNum<8>;
> @@ -109,6 +111,7 @@
>    def R13 : RegisterWithSubRegs<"R13", [R13D]>, DwarfRegNum<13>;
>    def R14 : RegisterWithSubRegs<"R14", [R14D]>, DwarfRegNum<14>;
>    def R15 : RegisterWithSubRegs<"R15", [R15D]>, DwarfRegNum<15>;
> +  def RIP : RegisterWithSubRegs<"RIP", [EIP]>,  DwarfRegNum<16>;
>
>    // MMX Registers. These are actually aliased to ST0 .. ST7
>    def MM0 : Register<"MM0">, DwarfRegNum<29>;
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From asl at math.spbu.ru  Wed May  2 13:11:23 2007
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 02 May 2007 22:11:23 +0400
Subject: [llvm-commits] CVS:
	llvm/lib/Target/X86/X86RegisterInfo.cpp	X86RegisterInfo.td
In-Reply-To: <965F198C-3210-444B-BC84-2268EE81B36C.SS3095SS@apple.com>
References: <200705020846.l428kK3X022648@zion.cs.uiuc.edu>
	<965F198C-3210-444B-BC84-2268EE81B36C.SS3095SS@apple.com>
Message-ID: <1178129483.29965.17.camel@asl.dorms.spbu.ru>

Evan,

> Anton, I believe different OS / target / DWARF imeplementations  
> assign different DWARF numbers to register. On Mac OS X, I am fairly  
> certain x86 and x86-64 assign different numbers. :-(  We need a  
> better way to handle this.
I've specially checked this case. DWARF register numbers are fixed for
all i386-based platforms (at least ones, supported by GCC). The only
special case seems to be cygwin/mingw, but I'll handle this case
separately.

Currently, I'm interested only in narrowing necessary bits (probably,
platform-dependent). Anyway, this won't hurt :)
-- 
With best regards, Anton Korobeynikov.

Faculty of Mathematics & Mechanics, Saint Petersburg State University.




From evan.cheng at apple.com  Wed May  2 13:35:23 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Wed, 2 May 2007 11:35:23 -0700
Subject: [llvm-commits] CVS:	llvm/lib/Target/X86/X86RegisterInfo.cpp
	X86RegisterInfo.td
In-Reply-To: <1178129483.29965.17.camel@asl.dorms.spbu.ru>
References: <200705020846.l428kK3X022648@zion.cs.uiuc.edu>
	<965F198C-3210-444B-BC84-2268EE81B36C.SS3095SS@apple.com>
	<1178129483.29965.17.camel@asl.dorms.spbu.ru>
Message-ID: <65829913-B837-42E8-9C02-3AF12D8268A2@apple.com>


On May 2, 2007, at 11:11 AM, Anton Korobeynikov wrote:

> Evan,
>
>> Anton, I believe different OS / target / DWARF imeplementations
>> assign different DWARF numbers to register. On Mac OS X, I am fairly
>> certain x86 and x86-64 assign different numbers. :-(  We need a
>> better way to handle this.
> I've specially checked this case. DWARF register numbers are fixed for
> all i386-based platforms (at least ones, supported by GCC). The only
> special case seems to be cygwin/mingw, but I'll handle this case
> separately.

Ok. Did you check both FSF and Apple gcc (llvm-gcc)?

>
> Currently, I'm interested only in narrowing necessary bits (probably,
> platform-dependent). Anyway, this won't hurt :)

Right. I figured since you are touching this you are taking  
ownership. :-) Perhaps you want to handle it.

Evan

> -- 
> With best regards, Anton Korobeynikov.
>
> Faculty of Mathematics & Mechanics, Saint Petersburg State University.
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From asl at math.spbu.ru  Wed May  2 14:53:53 2007
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 2 May 2007 14:53:53 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86ISelLowering.cpp
	X86RegisterInfo.cpp
Message-ID: <200705021953.l42JrrLW021737@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

X86ISelLowering.cpp updated: 1.397 -> 1.398
X86RegisterInfo.cpp updated: 1.218 -> 1.219
---
Log message:

Emit correct register move information in eh frames for X86. This allows Shootout-C++/except to pass on x86/linux 
with non-llvm-compiled (e.g. "native") unwind runtime.


---
Diffs of the changes:  (+56 -8)

 X86ISelLowering.cpp |   13 +++++++++++++
 X86RegisterInfo.cpp |   51 +++++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 56 insertions(+), 8 deletions(-)


Index: llvm/lib/Target/X86/X86ISelLowering.cpp
diff -u llvm/lib/Target/X86/X86ISelLowering.cpp:1.397 llvm/lib/Target/X86/X86ISelLowering.cpp:1.398
--- llvm/lib/Target/X86/X86ISelLowering.cpp:1.397	Tue Apr 24 16:16:55 2007
+++ llvm/lib/Target/X86/X86ISelLowering.cpp	Wed May  2 14:53:33 2007
@@ -226,6 +226,19 @@
       !Subtarget->isTargetCygMing())
     setOperationAction(ISD::LABEL, MVT::Other, Expand);
 
+  setOperationAction(ISD::EXCEPTIONADDR, MVT::i64, Expand);
+  setOperationAction(ISD::EHSELECTION,   MVT::i64, Expand);
+  setOperationAction(ISD::EXCEPTIONADDR, MVT::i32, Expand);
+  setOperationAction(ISD::EHSELECTION,   MVT::i32, Expand);
+  if (Subtarget->is64Bit()) {
+    // FIXME: Verify
+    setExceptionPointerRegister(X86::RAX);
+    setExceptionSelectorRegister(X86::RDX);
+  } else {
+    setExceptionPointerRegister(X86::EAX);
+    setExceptionSelectorRegister(X86::EDX);
+  }
+  
   // VASTART needs to be custom lowered to use the VarArgsFrameIndex
   setOperationAction(ISD::VASTART           , MVT::Other, Custom);
   setOperationAction(ISD::VAARG             , MVT::Other, Expand);


Index: llvm/lib/Target/X86/X86RegisterInfo.cpp
diff -u llvm/lib/Target/X86/X86RegisterInfo.cpp:1.218 llvm/lib/Target/X86/X86RegisterInfo.cpp:1.219
--- llvm/lib/Target/X86/X86RegisterInfo.cpp:1.218	Wed May  2 03:46:03 2007
+++ llvm/lib/Target/X86/X86RegisterInfo.cpp	Wed May  2 14:53:33 2007
@@ -26,6 +26,7 @@
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/MachineLocation.h"
+#include "llvm/Target/TargetAsmInfo.h"
 #include "llvm/Target/TargetFrameInfo.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
@@ -1060,11 +1061,17 @@
   MachineModuleInfo *MMI = MFI->getMachineModuleInfo();
   
   // Prepare for frame info.
-  unsigned FrameLabelId = 0;
+  unsigned FrameLabelId = 0, StartLabelId = 0;
   
   // Get the number of bytes to allocate from the FrameInfo
   uint64_t NumBytes = MFI->getStackSize();
 
+  if (MMI && MMI->needsFrameInfo()) {
+    // Mark function start
+    StartLabelId = MMI->NextLabelID();
+    BuildMI(MBB, MBBI, TII.get(X86::LABEL)).addImm(StartLabelId);
+  }
+
   if (NumBytes) {   // adjust stack pointer: ESP -= numbytes
     if (NumBytes >= 4096 && Subtarget->isTargetCygMing()) {
       // Check, whether EAX is livein for this function
@@ -1138,17 +1145,38 @@
 
   if (MMI && MMI->needsFrameInfo()) {
     std::vector &Moves = MMI->getFrameMoves();
-    
+    const TargetAsmInfo *TAI = MF.getTarget().getTargetAsmInfo();
+
+    // Calculate amount of bytes used for return address storing
+    int stackGrowth =
+      (MF.getTarget().getFrameInfo()->getStackGrowthDirection() ==
+       TargetFrameInfo::StackGrowsUp ?
+       TAI->getAddressSize() : -TAI->getAddressSize());
+
+    // Add return address to move list
+    MachineLocation CSDst(StackPtr, stackGrowth);
+    MachineLocation CSSrc(getRARegister());
+    Moves.push_back(MachineMove(StartLabelId, CSDst, CSSrc));
+
     if (NumBytes) {
       // Show update of SP.
-      MachineLocation SPDst(MachineLocation::VirtualFP);
-      MachineLocation SPSrc(MachineLocation::VirtualFP, -NumBytes);
-      Moves.push_back(MachineMove(FrameLabelId, SPDst, SPSrc));
+      if (hasFP(MF)) {
+        // Adjust SP
+        MachineLocation SPDst(MachineLocation::VirtualFP);
+        MachineLocation SPSrc(MachineLocation::VirtualFP, 2*stackGrowth);
+        Moves.push_back(MachineMove(FrameLabelId, SPDst, SPSrc));
+      } else {
+        MachineLocation SPDst(MachineLocation::VirtualFP);
+        MachineLocation SPSrc(MachineLocation::VirtualFP, -NumBytes+stackGrowth);
+        Moves.push_back(MachineMove(FrameLabelId, SPDst, SPSrc));
+      }
     } else {
-      MachineLocation SP(StackPtr);
-      Moves.push_back(MachineMove(FrameLabelId, SP, SP));
+      //FIXME: Verify & implement for FP
+      MachineLocation SPDst(StackPtr);
+      MachineLocation SPSrc(StackPtr, stackGrowth);
+      Moves.push_back(MachineMove(FrameLabelId, SPDst, SPSrc));
     }
-
+            
     // Add callee saved registers to move list.
     const std::vector &CSI = MFI->getCalleeSavedInfo();
     for (unsigned I = 0, E = CSI.size(); I != E; ++I) {
@@ -1162,6 +1190,13 @@
     // Mark effective beginning of when frame pointer is ready.
     unsigned ReadyLabelId = MMI->NextLabelID();
     BuildMI(MBB, MBBI, TII.get(X86::LABEL)).addImm(ReadyLabelId);
+
+    if (hasFP(MF)) {
+      // Save FP
+      MachineLocation FPDst(MachineLocation::VirtualFP, 2*stackGrowth);
+      MachineLocation FPSrc(FramePtr);
+      Moves.push_back(MachineMove(ReadyLabelId, FPDst, FPSrc));
+    }
     
     MachineLocation FPDst(hasFP(MF) ? FramePtr : StackPtr);
     MachineLocation FPSrc(MachineLocation::VirtualFP);





From lauro.venancio at gmail.com  Wed May  2 14:55:32 2007
From: lauro.venancio at gmail.com (Lauro Ramos Venancio)
Date: Wed, 2 May 2007 16:55:32 -0300
Subject: [llvm-commits] CVS: llvm/lib/Analysis/AliasAnalysis.cpp
	AliasAnalysisCounter.cpp AliasAnalysisEvaluator.cpp
	AliasDebugger.cpp AliasSetTracker.cpp BasicAliasAnalysis.cpp
	CFGPrinter.cpp InstCount.cpp IntervalPartition.cpp
	LoadValueNumbering.cpp Loo
Message-ID: <9c10c9f0705021255x561db443t77b6627a7a2151d0@mail.gmail.com>

The following build error is occurring.

Lauro

make[2]: Entering directory
`/armel-chroot/home/laurov/test/build/llvm/lib/Analysis'
llvm[2]: Compiling AliasAnalysis.cpp for Release build
AliasAnalysis.cpp:37: error: definition of 'llvm::AliasAnalysis::ID' is not
in namespace enclosing 'llvm::AliasAnalysis'
make[2]: ***
[/armel-chroot/home/laurov/test/build/llvm/lib/Analysis/Release/AliasAnalysis.o]
Error 1
make[2]: Leaving directory
`/armel-chroot/home/laurov/test/build/llvm/lib/Analysis'
make[1]: *** [Analysis/.makeall] Error 2

2007/5/1, Devang Patel :
>
>
>
> Changes in directory llvm/lib/Analysis:
>
> AliasAnalysis.cpp updated: 1.30 -> 1.31
> AliasAnalysisCounter.cpp updated: 1.20 -> 1.21
> AliasAnalysisEvaluator.cpp updated: 1.33 -> 1.34
> AliasDebugger.cpp updated: 1.3 -> 1.4
> AliasSetTracker.cpp updated: 1.46 -> 1.47
> BasicAliasAnalysis.cpp updated: 1.108 -> 1.109
> CFGPrinter.cpp updated: 1.22 -> 1.23
> InstCount.cpp updated: 1.20 -> 1.21
> IntervalPartition.cpp updated: 1.32 -> 1.33
> LoadValueNumbering.cpp updated: 1.39 -> 1.40
> LoopInfo.cpp updated: 1.83 -> 1.84
> LoopPass.cpp updated: 1.18 -> 1.19
> PostDominators.cpp updated: 1.67 -> 1.68
> ProfileInfo.cpp updated: 1.11 -> 1.12
> ProfileInfoLoaderPass.cpp updated: 1.18 -> 1.19
> ScalarEvolution.cpp updated: 1.112 -> 1.113
> ValueNumbering.cpp updated: 1.25 -> 1.26
> ---
> Log message:
>
> Do not use typeinfo to identify pass in pass manager.
>
>
> ---
> Diffs of the changes:  (+61 -5)
>
> AliasAnalysis.cpp          |    1 +
> AliasAnalysisCounter.cpp   |    4 +++-
> AliasAnalysisEvaluator.cpp |    4 ++++
> AliasDebugger.cpp          |    4 ++++
> AliasSetTracker.cpp        |    4 ++++
> BasicAliasAnalysis.cpp     |    6 ++++++
> CFGPrinter.cpp             |    6 ++++++
> InstCount.cpp              |    4 ++++
> IntervalPartition.cpp      |    4 +++-
> LoadValueNumbering.cpp     |    3 +++
> LoopInfo.cpp               |    1 +
> LoopPass.cpp               |    5 ++++-
> PostDominators.cpp         |    3 +++
> ProfileInfo.cpp            |    7 ++++++-
> ProfileInfoLoaderPass.cpp  |    4 +++-
> ScalarEvolution.cpp        |    1 +
> ValueNumbering.cpp         |    5 +++++
> 17 files changed, 61 insertions(+), 5 deletions(-)
>
>
> Index: llvm/lib/Analysis/AliasAnalysis.cpp
> diff -u llvm/lib/Analysis/AliasAnalysis.cpp:1.30llvm/lib/Analysis/AliasAnalysis.cpp:
> 1.31
> --- llvm/lib/Analysis/AliasAnalysis.cpp:1.30    Fri Nov 17 01:10:51 2006
> +++ llvm/lib/Analysis/AliasAnalysis.cpp Tue May  1 16:15:46 2007
> @@ -34,6 +34,7 @@
>
> // Register the AliasAnalysis interface, providing a nice name to refer
> to.
> namespace {
> +  const int AliasAnalysis::ID = 0;
>    RegisterAnalysisGroup Z("Alias Analysis");
> }
>
>
>
> Index: llvm/lib/Analysis/AliasAnalysisCounter.cpp
> diff -u llvm/lib/Analysis/AliasAnalysisCounter.cpp:1.20llvm/lib/Analysis/AliasAnalysisCounter.cpp:
> 1.21
> --- llvm/lib/Analysis/AliasAnalysisCounter.cpp:1.20     Mon Feb  5
> 17:42:17 2007
> +++ llvm/lib/Analysis/AliasAnalysisCounter.cpp  Tue May  1 16:15:46 2007
> @@ -34,7 +34,8 @@
>      const char *Name;
>      Module *M;
>    public:
> -    AliasAnalysisCounter() {
> +    static const int ID; // Class identification, replacement for
> typeinfo
> +    AliasAnalysisCounter() : ModulePass((intptr_t) &ID) {
>        No = May = Must = 0;
>        NoMR = JustRef = JustMod = MR = 0;
>      }
> @@ -107,6 +108,7 @@
>      }
>    };
>
> +  const int AliasAnalysisCounter::ID = 0;
>    RegisterPass
>    X("count-aa", "Count Alias Analysis Query Responses");
>    RegisterAnalysisGroup Y(X);
>
>
> Index: llvm/lib/Analysis/AliasAnalysisEvaluator.cpp
> diff -u llvm/lib/Analysis/AliasAnalysisEvaluator.cpp:1.33llvm/lib/Analysis/AliasAnalysisEvaluator.cpp:
> 1.34
> --- llvm/lib/Analysis/AliasAnalysisEvaluator.cpp:1.33   Mon Feb  5
> 17:42:17 2007
> +++ llvm/lib/Analysis/AliasAnalysisEvaluator.cpp        Tue May  1
> 16:15:46 2007
> @@ -50,6 +50,9 @@
>      unsigned NoModRef, Mod, Ref, ModRef;
>
>    public:
> +    static const int ID; // Pass identifcation, replacement for typeid
> +    AAEval() : FunctionPass((intptr_t)&ID) {}
> +
>      virtual void getAnalysisUsage(AnalysisUsage &AU) const {
>        AU.addRequired();
>        AU.setPreservesAll();
> @@ -70,6 +73,7 @@
>      bool doFinalization(Module &M);
>    };
>
> +  const int AAEval::ID = 0;
>    RegisterPass
>    X("aa-eval", "Exhaustive Alias Analysis Precision Evaluator");
> }
>
>
> Index: llvm/lib/Analysis/AliasDebugger.cpp
> diff -u llvm/lib/Analysis/AliasDebugger.cpp:1.3llvm/lib/Analysis/AliasDebugger.cpp:
> 1.4
> --- llvm/lib/Analysis/AliasDebugger.cpp:1.3     Mon Feb  5 17:42:17 2007
> +++ llvm/lib/Analysis/AliasDebugger.cpp Tue May  1 16:15:46 2007
> @@ -40,6 +40,9 @@
>      std::set Vals;
>
>    public:
> +    static const int ID; // Class identification, replacement for
> typeinfo
> +    AliasDebugger() : ModulePass((intptr_t)&ID) {}
> +
>      bool runOnModule(Module &M) {
>        InitializeAliasAnalysis(this);                 // set up super
> class
>
> @@ -119,6 +122,7 @@
>
>    };
>
> +  const int AliasDebugger::ID = 0;
>    RegisterPass X("debug-aa", "AA use debugger");
>    RegisterAnalysisGroup Y(X);
> }
>
>
> Index: llvm/lib/Analysis/AliasSetTracker.cpp
> diff -u llvm/lib/Analysis/AliasSetTracker.cpp:1.46llvm/lib/Analysis/AliasSetTracker.cpp:
> 1.47
> --- llvm/lib/Analysis/AliasSetTracker.cpp:1.46  Mon Feb  5 17:42:17 2007
> +++ llvm/lib/Analysis/AliasSetTracker.cpp       Tue May  1 16:15:46 2007
> @@ -555,6 +555,9 @@
>    class VISIBILITY_HIDDEN AliasSetPrinter : public FunctionPass {
>      AliasSetTracker *Tracker;
>    public:
> +    static const int ID; // Pass identifcation, replacement for typeid
> +    AliasSetPrinter() : FunctionPass((intptr_t)&ID) {}
> +
>      virtual void getAnalysisUsage(AnalysisUsage &AU) const {
>        AU.setPreservesAll();
>        AU.addRequired();
> @@ -570,5 +573,6 @@
>        return false;
>      }
>    };
> +  const int AliasSetPrinter::ID = 0;
>    RegisterPass X("print-alias-sets", "Alias Set
> Printer");
> }
>
>
> Index: llvm/lib/Analysis/BasicAliasAnalysis.cpp
> diff -u llvm/lib/Analysis/BasicAliasAnalysis.cpp:1.108llvm/lib/Analysis/BasicAliasAnalysis.cpp:
> 1.109
> --- llvm/lib/Analysis/BasicAliasAnalysis.cpp:1.108      Thu Apr 19
> 00:39:12 2007
> +++ llvm/lib/Analysis/BasicAliasAnalysis.cpp    Tue May  1 16:15:46 2007
> @@ -36,6 +36,9 @@
>    /// such it doesn't follow many of the rules that other alias analyses
> must.
>    ///
>    struct VISIBILITY_HIDDEN NoAA : public ImmutablePass, public
> AliasAnalysis {
> +    static const int ID; // Class identification, replacement for
> typeinfo
> +    NoAA() : ImmutablePass((intptr_t)&ID) {}
> +
>      virtual void getAnalysisUsage(AnalysisUsage &AU) const {
>        AU.addRequired();
>      }
> @@ -74,6 +77,7 @@
>    };
>
>    // Register this pass...
> +  const int NoAA::ID = 0;
>    RegisterPass
>    U("no-aa", "No Alias Analysis (always returns 'may' alias)");
>
> @@ -88,6 +92,7 @@
>    /// Because it doesn't chain to a previous alias analysis (like
> -no-aa), it
>    /// derives from the NoAA class.
>    struct VISIBILITY_HIDDEN BasicAliasAnalysis : public NoAA {
> +    static const int ID; // Class identification, replacement for
> typeinfo
>      AliasResult alias(const Value *V1, unsigned V1Size,
>                        const Value *V2, unsigned V2Size);
>
> @@ -119,6 +124,7 @@
>    };
>
>    // Register this pass...
> +  const int BasicAliasAnalysis::ID = 0;
>    RegisterPass
>    X("basicaa", "Basic Alias Analysis (default AA impl)");
>
>
>
> Index: llvm/lib/Analysis/CFGPrinter.cpp
> diff -u llvm/lib/Analysis/CFGPrinter.cpp:1.22llvm/lib/Analysis/CFGPrinter.cpp:
> 1.23
> --- llvm/lib/Analysis/CFGPrinter.cpp:1.22       Mon Feb  5 17:42:17 2007
> +++ llvm/lib/Analysis/CFGPrinter.cpp    Tue May  1 16:15:46 2007
> @@ -91,6 +91,9 @@
>
> namespace {
>    struct VISIBILITY_HIDDEN CFGPrinter : public FunctionPass {
> +    static const int ID; // Pass identifcation, replacement for typeid
> +    CFGPrinter() : FunctionPass((intptr_t)&ID) {}
> +
>      virtual bool runOnFunction(Function &F) {
>        std::string Filename = "cfg." + F.getName() + ".dot";
>        cerr << "Writing '" << Filename << "'...";
> @@ -111,10 +114,12 @@
>      }
>    };
>
> +  const int CFGPrinter::ID = 0;
>    RegisterPass P1("print-cfg",
>                                "Print CFG of function to 'dot' file");
>
>    struct VISIBILITY_HIDDEN CFGOnlyPrinter : public CFGPrinter {
> +    static const int ID; // Pass identifcation, replacement for typeid
>      virtual bool runOnFunction(Function &F) {
>        bool OldCFGOnly = CFGOnly;
>        CFGOnly = true;
> @@ -129,6 +134,7 @@
>      }
>    };
>
> +  const int CFGOnlyPrinter::ID = 0;
>    RegisterPass
>    P2("print-cfg-only",
>       "Print CFG of function to 'dot' file (with no function bodies)");
>
>
> Index: llvm/lib/Analysis/InstCount.cpp
> diff -u llvm/lib/Analysis/InstCount.cpp:1.20llvm/lib/Analysis/InstCount.cpp:
> 1.21
> --- llvm/lib/Analysis/InstCount.cpp:1.20        Mon Feb  5 17:42:17 2007
> +++ llvm/lib/Analysis/InstCount.cpp     Tue May  1 16:15:46 2007
> @@ -51,6 +51,9 @@
>        abort();
>      }
>    public:
> +    static const int ID; // Pass identifcation, replacement for typeid
> +    InstCount() : FunctionPass((intptr_t)&ID) {}
> +
>      virtual bool runOnFunction(Function &F);
>
>      virtual void getAnalysisUsage(AnalysisUsage &AU) const {
> @@ -60,6 +63,7 @@
>
>    };
>
> +  const int InstCount::ID = 0;
>    RegisterPass X("instcount",
>                              "Counts the various types of Instructions");
> }
>
>
> Index: llvm/lib/Analysis/IntervalPartition.cpp
> diff -u llvm/lib/Analysis/IntervalPartition.cpp:1.32llvm/lib/Analysis/IntervalPartition.cpp:
> 1.33
> --- llvm/lib/Analysis/IntervalPartition.cpp:1.32        Sun Aug 27
> 17:30:17 2006
> +++ llvm/lib/Analysis/IntervalPartition.cpp     Tue May  1 16:15:46 2007
> @@ -15,6 +15,7 @@
> #include "llvm/Analysis/IntervalIterator.h"
> using namespace llvm;
>
> +const int IntervalPartition::ID = 0;
> static RegisterPass
> X("intervals", "Interval Partition Construction", true);
>
> @@ -88,7 +89,8 @@
> // existing interval graph.  This takes an additional boolean parameter to
> // distinguish it from a copy constructor.  Always pass in false for now.
> //
> -IntervalPartition::IntervalPartition(IntervalPartition &IP, bool) {
> +IntervalPartition::IntervalPartition(IntervalPartition &IP, bool)
> +  : FunctionPass((intptr_t) &ID) {
>    Interval *FunctionStart = IP.getRootInterval();
>    assert(FunctionStart && "Cannot operate on empty IntervalPartitions!");
>
>
>
> Index: llvm/lib/Analysis/LoadValueNumbering.cpp
> diff -u llvm/lib/Analysis/LoadValueNumbering.cpp:1.39llvm/lib/Analysis/LoadValueNumbering.cpp:
> 1.40
> --- llvm/lib/Analysis/LoadValueNumbering.cpp:1.39       Tue Apr 17
> 12:52:45 2007
> +++ llvm/lib/Analysis/LoadValueNumbering.cpp    Tue May  1 16:15:46 2007
> @@ -40,6 +40,8 @@
> namespace {
>    // FIXME: This should not be a FunctionPass.
>    struct VISIBILITY_HIDDEN LoadVN : public FunctionPass, public
> ValueNumbering {
> +    static const int ID; // Class identification, replacement for
> typeinfo
> +    LoadVN() : FunctionPass((intptr_t)&ID) {}
>
>      /// Pass Implementation stuff.  This doesn't do any analysis.
>      ///
> @@ -81,6 +83,7 @@
>                                   std::vector &RetVals) const;
>    };
>
> +  const int LoadVN::ID = 0;
>    // Register this pass...
>    RegisterPass X("load-vn", "Load Value Numbering");
>
>
>
> Index: llvm/lib/Analysis/LoopInfo.cpp
> diff -u llvm/lib/Analysis/LoopInfo.cpp:1.83llvm/lib/Analysis/LoopInfo.cpp:
> 1.84
> --- llvm/lib/Analysis/LoopInfo.cpp:1.83 Sat Mar  3 22:06:39 2007
> +++ llvm/lib/Analysis/LoopInfo.cpp      Tue May  1 16:15:46 2007
> @@ -27,6 +27,7 @@
> #include 
> using namespace llvm;
>
> +const int LoopInfo::ID = 0;
> static RegisterPass
> X("loops", "Natural Loop Construction", true);
>
>
>
> Index: llvm/lib/Analysis/LoopPass.cpp
> diff -u llvm/lib/Analysis/LoopPass.cpp:1.18llvm/lib/Analysis/LoopPass.cpp:
> 1.19
> --- llvm/lib/Analysis/LoopPass.cpp:1.18 Wed Mar  7 00:39:01 2007
> +++ llvm/lib/Analysis/LoopPass.cpp      Tue May  1 16:15:46 2007
> @@ -20,9 +20,12 @@
>
> //===----------------------------------------------------------------------===//
> // LPPassManager
> //
> +
> +const int LPPassManager::ID = 0;
> /// LPPassManager manages FPPassManagers and CalLGraphSCCPasses.
>
> -LPPassManager::LPPassManager(int Depth) : PMDataManager(Depth) {
> +LPPassManager::LPPassManager(int Depth)
> +  : FunctionPass((intptr_t)&ID), PMDataManager(Depth) {
>    skipThisLoop = false;
>    redoThisLoop = false;
>    LI = NULL;
>
>
> Index: llvm/lib/Analysis/PostDominators.cpp
> diff -u llvm/lib/Analysis/PostDominators.cpp:1.67llvm/lib/Analysis/PostDominators.cpp:
> 1.68
> --- llvm/lib/Analysis/PostDominators.cpp:1.67   Tue Apr 17 20:19:55 2007
> +++ llvm/lib/Analysis/PostDominators.cpp        Tue May  1 16:15:46 2007
> @@ -22,6 +22,9 @@
> //  PostDominatorTree Implementation
>
> //===----------------------------------------------------------------------===//
>
> +const int PostDominatorTree::ID = 0;
> +const int PostDominanceFrontier::ID = 0;
> +const int PostETForest::ID = 0;
> static RegisterPass
> F("postdomtree", "Post-Dominator Tree Construction", true);
>
>
>
> Index: llvm/lib/Analysis/ProfileInfo.cpp
> diff -u llvm/lib/Analysis/ProfileInfo.cpp:1.11llvm/lib/Analysis/ProfileInfo.cpp:
> 1.12
> --- llvm/lib/Analysis/ProfileInfo.cpp:1.11      Thu Mar 22 11:38:57 2007
> +++ llvm/lib/Analysis/ProfileInfo.cpp   Tue May  1 16:15:46 2007
> @@ -22,6 +22,7 @@
>
> // Register the ProfileInfo interface, providing a nice name to refer to.
> namespace {
> +  const int ProfileInfo::ID = 0;
>    RegisterAnalysisGroup Z("Profile Information");
> }
>
> @@ -84,8 +85,12 @@
>
> namespace {
>    struct VISIBILITY_HIDDEN NoProfileInfo
> -    : public ImmutablePass, public ProfileInfo {};
> +    : public ImmutablePass, public ProfileInfo {
> +    static const int ID; // Class identification, replacement for
> typeinfo
> +    NoProfileInfo() : ImmutablePass((intptr_t)&ID) {}
> +  };
>
> +  const int NoProfileInfo::ID = 0;
>    // Register this pass...
>    RegisterPass
>    X("no-profile", "No Profile Information");
>
>
> Index: llvm/lib/Analysis/ProfileInfoLoaderPass.cpp
> diff -u llvm/lib/Analysis/ProfileInfoLoaderPass.cpp:1.18llvm/lib/Analysis/ProfileInfoLoaderPass.cpp:
> 1.19
> --- llvm/lib/Analysis/ProfileInfoLoaderPass.cpp:1.18    Mon Feb  5
> 17:42:17 2007
> +++ llvm/lib/Analysis/ProfileInfoLoaderPass.cpp Tue May  1 16:15:46 2007
> @@ -32,8 +32,9 @@
>    class VISIBILITY_HIDDEN LoaderPass : public ModulePass, public
> ProfileInfo {
>      std::string Filename;
>    public:
> +    static const int ID; // Class identification, replacement for
> typeinfo
>      LoaderPass(const std::string &filename = "")
> -      : Filename(filename) {
> +      : ModulePass((intptr_t)&ID), Filename(filename) {
>        if (filename.empty()) Filename = ProfileInfoFilename;
>      }
>
> @@ -49,6 +50,7 @@
>      virtual bool runOnModule(Module &M);
>    };
>
> +  const int LoaderPass::ID = 0;
>    RegisterPass
>    X("profile-loader", "Load profile information from llvmprof.out");
>
>
>
> Index: llvm/lib/Analysis/ScalarEvolution.cpp
> diff -u llvm/lib/Analysis/ScalarEvolution.cpp:1.112llvm/lib/Analysis/ScalarEvolution.cpp:
> 1.113
> --- llvm/lib/Analysis/ScalarEvolution.cpp:1.112 Sun Apr 15 21:24:41 2007
> +++ llvm/lib/Analysis/ScalarEvolution.cpp       Tue May  1 16:15:46 2007
> @@ -102,6 +102,7 @@
>                          cl::init(100));
>
> namespace {
> +  const int ScalarEvolution::ID = 0;
>    RegisterPass
>    R("scalar-evolution", "Scalar Evolution Analysis");
> }
>
>
> Index: llvm/lib/Analysis/ValueNumbering.cpp
> diff -u llvm/lib/Analysis/ValueNumbering.cpp:1.25llvm/lib/Analysis/ValueNumbering.cpp:
> 1.26
> --- llvm/lib/Analysis/ValueNumbering.cpp:1.25   Mon Feb  5 17:42:17 2007
> +++ llvm/lib/Analysis/ValueNumbering.cpp        Tue May  1 16:15:46 2007
> @@ -22,6 +22,7 @@
> #include "llvm/Support/Compiler.h"
> using namespace llvm;
>
> +const int ValueNumbering::ID = 0;
> // Register the ValueNumbering interface, providing a nice name to refer
> to.
> static RegisterAnalysisGroup X("Value Numbering");
>
> @@ -51,6 +52,9 @@
>    ///
>    struct VISIBILITY_HIDDEN BasicVN
>        : public ImmutablePass, public ValueNumbering {
> +    static const int ID; // Class identification, replacement for
> typeinfo
> +    BasicVN() : ImmutablePass((intptr_t)&ID) {}
> +
>      /// getEqualNumberNodes - Return nodes with the same value number as
> the
>      /// specified Value.  This fills in the argument vector with any
> equal
>      /// values.
> @@ -61,6 +65,7 @@
>                                       std::vector &RetVals) const;
>    };
>
> +  const int BasicVN::ID = 0;
>    // Register this pass...
>    RegisterPass
>    X("basicvn", "Basic Value Numbering (default GVN impl)");
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20070502/1954d45f/attachment.html 

From evan.cheng at apple.com  Wed May  2 15:21:39 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Wed, 2 May 2007 13:21:39 -0700
Subject: [llvm-commits] ELF sections in X86AsmTargetAsm.cpp
In-Reply-To: <20070501135045.GS25688@village.us.cray.com>
References: <20070501135045.GS25688@village.us.cray.com>
Message-ID: 

Looks safe to me. :-) But I don't have access to a Linux box to  
verify. Anton, can you check?

Evan
On May 1, 2007, at 6:50 AM, Dan Gohman wrote:

> The attached patch sets the section names for fixed-size constants for
> ELF on x86 to match what GCC uses, and it uses the mergeable flag so
> that duplicate constants can be merged.
>
> This works for me with GAS; are there other assemblers (or linkers?)
> being used with LLVM on x86 ELF targets that don't support this?
> It looks like nasm/yasm wouldn't accept some of the other things
> that LLVM currently emits anyway..
>
> Dan
>
> -- 
> Dan Gohman, Cray Inc.
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From dpatel at apple.com  Wed May  2 15:27:27 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 13:27:27 -0700
Subject: [llvm-commits] CVS: llvm/lib/Analysis/AliasAnalysis.cpp
	AliasAnalysisCounter.cpp
	AliasAnalysisEvaluator.cpp	AliasDebugger.cpp
	AliasSetTracker.cpp BasicAliasAnalysis.cpp	CFGPrinter.cpp
	InstCount.cpp IntervalPartition.cpp	LoadValueNumbering.cpp Loo
In-Reply-To: <9c10c9f0705021255x561db443t77b6627a7a2151d0@mail.gmail.com>
References: <9c10c9f0705021255x561db443t77b6627a7a2151d0@mail.gmail.com>
Message-ID: <0C30B328-5028-4F8C-A069-97193C96844C@apple.com>


On May 2, 2007, at 12:55 PM, Lauro Ramos Venancio wrote:

> The following build error is occurring.
>
> Lauro
>
> make[2]: Entering directory `/armel-chroot/home/laurov/test/build/ 
> llvm/lib/Analysis'
> llvm[2]: Compiling AliasAnalysis.cpp for Release build
> AliasAnalysis.cpp :37: error: definition of  
> 'llvm::AliasAnalysis::ID' is not in namespace enclosing  
> 'llvm::AliasAnalysis'
> make[2]: *** [/armel-chroot/home/laurov/test/build/llvm/lib/Analysis/ 
> Release/AliasAnalysis.o] Error 1
> make[2]: Leaving directory `/armel-chroot/home/laurov/test/build/ 
> llvm/lib/Analysis'
> make[1]: *** [Analysis/.makeall] Error 2

hmm.. I did not get this error.
Does it help to move 'const int AliasAnalysis::ID = 0;' outside  
anonymous namespace ?

Thanks,
-
Devang


From lauro.venancio at gmail.com  Wed May  2 15:34:54 2007
From: lauro.venancio at gmail.com (Lauro Ramos Venancio)
Date: Wed, 2 May 2007 17:34:54 -0300
Subject: [llvm-commits] CVS: llvm/lib/Analysis/AliasAnalysis.cpp
	AliasAnalysisCounter.cpp AliasAnalysisEvaluator.cpp
	AliasDebugger.cpp AliasSetTracker.cpp BasicAliasAnalysis.cpp
	CFGPrinter.cpp InstCount.cpp IntervalPartition.cpp
	LoadValueNumbering.cpp Loo
In-Reply-To: <0C30B328-5028-4F8C-A069-97193C96844C@apple.com>
References: <9c10c9f0705021255x561db443t77b6627a7a2151d0@mail.gmail.com>
	<0C30B328-5028-4F8C-A069-97193C96844C@apple.com>
Message-ID: <9c10c9f0705021334x2cdbb5d7i10a9903c10ed162c@mail.gmail.com>

>
>
> hmm.. I did not get this error.
> Does it help to move 'const int AliasAnalysis::ID = 0;' outside
> anonymous namespace ?
>
>
Yes, to move the definition resolves the problem. I already fixed this
problem. I will commit in few minutes.

Lauro
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20070502/8be21ddd/attachment.html 

From lauro.venancio at gmail.com  Wed May  2 15:38:15 2007
From: lauro.venancio at gmail.com (Lauro Ramos Venancio)
Date: Wed, 2 May 2007 15:38:15 -0500
Subject: [llvm-commits] CVS: llvm/lib/Analysis/IPA/CallGraph.cpp
Message-ID: <200705022038.l42KcFNW022624@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Analysis/IPA:

CallGraph.cpp updated: 1.66 -> 1.67
---
Log message:

Fix build error.


---
Diffs of the changes:  (+4 -2)

 CallGraph.cpp |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


Index: llvm/lib/Analysis/IPA/CallGraph.cpp
diff -u llvm/lib/Analysis/IPA/CallGraph.cpp:1.66 llvm/lib/Analysis/IPA/CallGraph.cpp:1.67
--- llvm/lib/Analysis/IPA/CallGraph.cpp:1.66	Tue May  1 16:15:46 2007
+++ llvm/lib/Analysis/IPA/CallGraph.cpp	Wed May  2 15:37:47 2007
@@ -190,14 +190,16 @@
   }
 };
 
-const int CallGraph::ID = 0;
+
 RegisterAnalysisGroup X("Call Graph");
-const int BasicCallGraph::ID = 0;
 RegisterPass Y("basiccg", "Basic CallGraph Construction");
 RegisterAnalysisGroup Z(Y);
 
 } //End anonymous namespace
 
+const int CallGraph::ID = 0;
+const int BasicCallGraph::ID = 0;
+
 void CallGraph::initialize(Module &M) {
   Mod = &M;
 }





From lauro.venancio at gmail.com  Wed May  2 15:38:20 2007
From: lauro.venancio at gmail.com (Lauro Ramos Venancio)
Date: Wed, 2 May 2007 15:38:20 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Instrumentation/RSProfiling.cpp
Message-ID: <200705022038.l42KcKMi022635@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Instrumentation:

RSProfiling.cpp updated: 1.24 -> 1.25
---
Log message:

Fix build error.


---
Diffs of the changes:  (+4 -3)

 RSProfiling.cpp |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)


Index: llvm/lib/Transforms/Instrumentation/RSProfiling.cpp
diff -u llvm/lib/Transforms/Instrumentation/RSProfiling.cpp:1.24 llvm/lib/Transforms/Instrumentation/RSProfiling.cpp:1.25
--- llvm/lib/Transforms/Instrumentation/RSProfiling.cpp:1.24	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Instrumentation/RSProfiling.cpp	Wed May  2 15:37:47 2007
@@ -81,9 +81,7 @@
     }
   };
 
-  const int RSProfilers::ID = 0;
   static RegisterAnalysisGroup A("Profiling passes");
-  const int NullProfilerRS::ID = 0;
   static RegisterPass NP("insert-null-profiling-rs",
                                          "Measure profiling framework overhead");
   static RegisterAnalysisGroup NPT(NP);
@@ -160,11 +158,14 @@
     virtual void getAnalysisUsage(AnalysisUsage &AU) const;
   };
 
-  const int ProfilerRS::ID = 0;
   RegisterPass X("insert-rs-profiling-framework",
                              "Insert random sampling instrumentation framework");
 }
 
+const int RSProfilers::ID = 0;
+const int NullProfilerRS::ID = 0;
+const int ProfilerRS::ID = 0;
+
 //Local utilities
 static void ReplacePhiPred(BasicBlock* btarget, 
                            BasicBlock* bold, BasicBlock* bnew);





From lauro.venancio at gmail.com  Wed May  2 15:38:21 2007
From: lauro.venancio at gmail.com (Lauro Ramos Venancio)
Date: Wed, 2 May 2007 15:38:21 -0500
Subject: [llvm-commits] CVS: llvm/lib/Analysis/AliasAnalysis.cpp
	ProfileInfo.cpp ScalarEvolution.cpp
Message-ID: <200705022038.l42KcLWQ022644@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Analysis:

AliasAnalysis.cpp updated: 1.31 -> 1.32
ProfileInfo.cpp updated: 1.12 -> 1.13
ScalarEvolution.cpp updated: 1.113 -> 1.114
---
Log message:

Fix build error.


---
Diffs of the changes:  (+3 -3)

 AliasAnalysis.cpp   |    2 +-
 ProfileInfo.cpp     |    2 +-
 ScalarEvolution.cpp |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


Index: llvm/lib/Analysis/AliasAnalysis.cpp
diff -u llvm/lib/Analysis/AliasAnalysis.cpp:1.31 llvm/lib/Analysis/AliasAnalysis.cpp:1.32
--- llvm/lib/Analysis/AliasAnalysis.cpp:1.31	Tue May  1 16:15:46 2007
+++ llvm/lib/Analysis/AliasAnalysis.cpp	Wed May  2 15:37:47 2007
@@ -34,9 +34,9 @@
 
 // Register the AliasAnalysis interface, providing a nice name to refer to.
 namespace {
-  const int AliasAnalysis::ID = 0;
   RegisterAnalysisGroup Z("Alias Analysis");
 }
+const int AliasAnalysis::ID = 0;
 
 //===----------------------------------------------------------------------===//
 // Default chaining methods


Index: llvm/lib/Analysis/ProfileInfo.cpp
diff -u llvm/lib/Analysis/ProfileInfo.cpp:1.12 llvm/lib/Analysis/ProfileInfo.cpp:1.13
--- llvm/lib/Analysis/ProfileInfo.cpp:1.12	Tue May  1 16:15:46 2007
+++ llvm/lib/Analysis/ProfileInfo.cpp	Wed May  2 15:37:47 2007
@@ -22,9 +22,9 @@
 
 // Register the ProfileInfo interface, providing a nice name to refer to.
 namespace {
-  const int ProfileInfo::ID = 0;
   RegisterAnalysisGroup Z("Profile Information");
 }
+const int ProfileInfo::ID = 0;
 
 ProfileInfo::~ProfileInfo() {}
 


Index: llvm/lib/Analysis/ScalarEvolution.cpp
diff -u llvm/lib/Analysis/ScalarEvolution.cpp:1.113 llvm/lib/Analysis/ScalarEvolution.cpp:1.114
--- llvm/lib/Analysis/ScalarEvolution.cpp:1.113	Tue May  1 16:15:46 2007
+++ llvm/lib/Analysis/ScalarEvolution.cpp	Wed May  2 15:37:47 2007
@@ -102,10 +102,10 @@
                         cl::init(100));
 
 namespace {
-  const int ScalarEvolution::ID = 0;
   RegisterPass
   R("scalar-evolution", "Scalar Evolution Analysis");
 }
+const int ScalarEvolution::ID = 0;
 
 //===----------------------------------------------------------------------===//
 //                           SCEV class definitions





From lauro.venancio at gmail.com  Wed May  2 15:38:21 2007
From: lauro.venancio at gmail.com (Lauro Ramos Venancio)
Date: Wed, 2 May 2007 15:38:21 -0500
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/LiveIntervalAnalysis.cpp
	MachineModuleInfo.cpp
Message-ID: <200705022038.l42KcLn0022652@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen:

LiveIntervalAnalysis.cpp updated: 1.240 -> 1.241
MachineModuleInfo.cpp updated: 1.6 -> 1.7
---
Log message:

Fix build error.


---
Diffs of the changes:  (+2 -2)

 LiveIntervalAnalysis.cpp |    2 +-
 MachineModuleInfo.cpp    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm/lib/CodeGen/LiveIntervalAnalysis.cpp
diff -u llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.240 llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.241
--- llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.240	Tue May  1 16:15:46 2007
+++ llvm/lib/CodeGen/LiveIntervalAnalysis.cpp	Wed May  2 15:37:47 2007
@@ -44,8 +44,8 @@
 STATISTIC(numFolded   , "Number of loads/stores folded into instructions");
 STATISTIC(numAborts   , "Number of times interval joining aborted");
 
+const int LiveIntervals::ID = 0;
 namespace {
-  const int LiveIntervals::ID = 0;
   RegisterPass X("liveintervals", "Live Interval Analysis");
 
   static cl::opt


Index: llvm/lib/CodeGen/MachineModuleInfo.cpp
diff -u llvm/lib/CodeGen/MachineModuleInfo.cpp:1.6 llvm/lib/CodeGen/MachineModuleInfo.cpp:1.7
--- llvm/lib/CodeGen/MachineModuleInfo.cpp:1.6	Tue May  1 16:15:46 2007
+++ llvm/lib/CodeGen/MachineModuleInfo.cpp	Wed May  2 15:37:47 2007
@@ -28,9 +28,9 @@
 
 // Handle the Pass registration stuff necessary to use TargetData's.
 namespace {
-  const int MachineModuleInfo::ID = 0;
   RegisterPass X("machinemoduleinfo", "Module Information");
 }
+const int MachineModuleInfo::ID = 0;
 
 //===----------------------------------------------------------------------===//
 





From lauro.venancio at gmail.com  Wed May  2 15:38:17 2007
From: lauro.venancio at gmail.com (Lauro Ramos Venancio)
Date: Wed, 2 May 2007 15:38:17 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/TargetData.cpp
Message-ID: <200705022038.l42KcHOw022629@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target:

TargetData.cpp updated: 1.108 -> 1.109
---
Log message:

Fix build error.


---
Diffs of the changes:  (+1 -1)

 TargetData.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/lib/Target/TargetData.cpp
diff -u llvm/lib/Target/TargetData.cpp:1.108 llvm/lib/Target/TargetData.cpp:1.109
--- llvm/lib/Target/TargetData.cpp:1.108	Tue May  1 16:15:46 2007
+++ llvm/lib/Target/TargetData.cpp	Wed May  2 15:37:47 2007
@@ -33,9 +33,9 @@
 // Handle the Pass registration stuff necessary to use TargetData's.
 namespace {
   // Register the default SparcV9 implementation...
-  const int TargetData::ID = 0;
   RegisterPass X("targetdata", "Target Data Layout");
 }
+const int TargetData::ID = 0;
 
 //===----------------------------------------------------------------------===//
 // Support for StructLayout





From dpatel at apple.com  Wed May  2 15:38:43 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 15:38:43 -0500
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Pass.cpp
Message-ID: <200705022038.l42KchIx022672@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

Pass.cpp updated: 1.90 -> 1.91
---
Log message:

Re-install patch to enable use of PassID.
I am preparing another patch to address the failure that prompted
Chris to revert this patch earlier.


---
Diffs of the changes:  (+14 -15)

 Pass.cpp |   29 ++++++++++++++---------------
 1 files changed, 14 insertions(+), 15 deletions(-)


Index: llvm/lib/VMCore/Pass.cpp
diff -u llvm/lib/VMCore/Pass.cpp:1.90 llvm/lib/VMCore/Pass.cpp:1.91
--- llvm/lib/VMCore/Pass.cpp:1.90	Tue May  1 23:25:31 2007
+++ llvm/lib/VMCore/Pass.cpp	Wed May  2 15:38:25 2007
@@ -133,7 +133,7 @@
 class PassRegistrar {
   /// PassInfoMap - Keep track of the passinfo object for each registered llvm
   /// pass.
-  std::map PassInfoMap;
+  std::map PassInfoMap;
   
   /// AnalysisGroupInfo - Keep track of information for each analysis group.
   struct AnalysisGroupInfo {
@@ -147,19 +147,19 @@
 
 public:
   
-  const PassInfo *GetPassInfo(const std::type_info &TI) const {
-    std::map::const_iterator I = PassInfoMap.find(TI);
+  const PassInfo *GetPassInfo(intptr_t TI) const {
+    std::map::const_iterator I = PassInfoMap.find(TI);
     return I != PassInfoMap.end() ? I->second : 0;
   }
   
   void RegisterPass(PassInfo &PI) {
     bool Inserted =
-      PassInfoMap.insert(std::make_pair(TypeInfo(PI.getTypeInfo()),&PI)).second;
+      PassInfoMap.insert(std::make_pair(PI.getTypeInfo(),&PI)).second;
     assert(Inserted && "Pass registered multiple times!");
   }
   
   void UnregisterPass(PassInfo &PI) {
-    std::map::iterator I =
+    std::map::iterator I =
       PassInfoMap.find(PI.getTypeInfo());
     assert(I != PassInfoMap.end() && "Pass registered but not in map!");
     
@@ -168,7 +168,7 @@
   }
   
   void EnumerateWith(PassRegistrationListener *L) {
-    for (std::map::const_iterator I = PassInfoMap.begin(),
+    for (std::map::const_iterator I = PassInfoMap.begin(),
          E = PassInfoMap.end(); I != E; ++I)
       L->passEnumerate(I->second);
   }
@@ -210,11 +210,10 @@
 // getPassInfo - Return the PassInfo data structure that corresponds to this
 // pass...
 const PassInfo *Pass::getPassInfo() const {
-  if (PassInfoCache) return PassInfoCache;
-  return lookupPassInfo(typeid(*this));
+  return lookupPassInfo(PassID);
 }
 
-const PassInfo *Pass::lookupPassInfo(const std::type_info &TI) {
+const PassInfo *Pass::lookupPassInfo(intptr_t TI) {
   return getPassRegistrar()->GetPassInfo(TI);
 }
 
@@ -238,12 +237,12 @@
 
 // RegisterAGBase implementation
 //
-RegisterAGBase::RegisterAGBase(const std::type_info &Interface,
-                               const std::type_info *Pass, bool isDefault)
-  : RegisterPassBase(Interface),
+RegisterAGBase::RegisterAGBase(intptr_t InterfaceID,
+                               intptr_t PassID, bool isDefault)
+  : RegisterPassBase(InterfaceID),
     ImplementationInfo(0), isDefaultImplementation(isDefault) {
 
-  InterfaceInfo = const_cast(Pass::lookupPassInfo(Interface));
+  InterfaceInfo = const_cast(Pass::lookupPassInfo(InterfaceID));
   if (InterfaceInfo == 0) {
     // First reference to Interface, register it now.
     registerPass();
@@ -252,8 +251,8 @@
   assert(PIObj.isAnalysisGroup() &&
          "Trying to join an analysis group that is a normal pass!");
 
-  if (Pass) {
-    ImplementationInfo = Pass::lookupPassInfo(*Pass);
+  if (PassID) {
+    ImplementationInfo = Pass::lookupPassInfo(PassID);
     assert(ImplementationInfo &&
            "Must register pass before adding to AnalysisGroup!");
 





From dpatel at apple.com  Wed May  2 15:38:48 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 15:38:48 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Pass.h PassSupport.h
Message-ID: <200705022038.l42KcmCe022680@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

Pass.h updated: 1.88 -> 1.89
PassSupport.h updated: 1.40 -> 1.41
---
Log message:

Re-install patch to enable use of PassID.
I am preparing another patch to address the failure that prompted
Chris to revert this patch earlier.


---
Diffs of the changes:  (+20 -20)

 Pass.h        |   14 +++++++-------
 PassSupport.h |   26 +++++++++++++-------------
 2 files changed, 20 insertions(+), 20 deletions(-)


Index: llvm/include/llvm/Pass.h
diff -u llvm/include/llvm/Pass.h:1.88 llvm/include/llvm/Pass.h:1.89
--- llvm/include/llvm/Pass.h:1.88	Tue May  1 23:25:30 2007
+++ llvm/include/llvm/Pass.h	Wed May  2 15:38:25 2007
@@ -34,8 +34,8 @@
 #include 
 #include 
 #include 
-#include 
 #include 
+#include 
 
 namespace llvm {
 
@@ -77,7 +77,7 @@
 ///
 class Pass {
   AnalysisResolver *Resolver;  // Used to resolve analysis
-  const PassInfo *PassInfoCache;
+  intptr_t PassID;
 
   // AnalysisImpls - This keeps track of which passes implement the interfaces
   // that are required by the current pass (to implement getAnalysis()).
@@ -87,7 +87,7 @@
   void operator=(const Pass&);  // DO NOT IMPLEMENT
   Pass(const Pass &);           // DO NOT IMPLEMENT
 public:
-  Pass(intptr_t pid = 0) : Resolver(0), PassInfoCache(0) {}
+  Pass(intptr_t pid) : Resolver(0), PassID(pid) {}
   virtual ~Pass();
 
   /// getPassName - Return a nice clean name for a pass.  This usually
@@ -163,12 +163,12 @@
 
   template
   static const PassInfo *getClassPassInfo() {
-    return lookupPassInfo(typeid(AnalysisClass));
+    return lookupPassInfo((intptr_t)&AnalysisClass::ID);
   }
 
   // lookupPassInfo - Return the pass info object for the specified pass class,
   // or null if it is not known.
-  static const PassInfo *lookupPassInfo(const std::type_info &TI);
+  static const PassInfo *lookupPassInfo(intptr_t TI);
 
   /// getAnalysisToUpdate() - This function is used by subclasses
   /// to get to the analysis information that might be around that needs to be
@@ -274,7 +274,7 @@
 class FunctionPass : public Pass {
 public:
   FunctionPass(intptr_t pid) : Pass(pid) {}
-  
+
   /// doInitialization - Virtual method overridden by subclasses to do
   /// any necessary per-module initialization.
   ///
@@ -325,7 +325,7 @@
 class BasicBlockPass : public Pass {
 public:
   BasicBlockPass(intptr_t pid) : Pass(pid) {}
-  
+
   /// doInitialization - Virtual method overridden by subclasses to do
   /// any necessary per-module initialization.
   ///


Index: llvm/include/llvm/PassSupport.h
diff -u llvm/include/llvm/PassSupport.h:1.40 llvm/include/llvm/PassSupport.h:1.41
--- llvm/include/llvm/PassSupport.h:1.40	Tue May  1 23:25:30 2007
+++ llvm/include/llvm/PassSupport.h	Wed May  2 15:38:25 2007
@@ -37,19 +37,19 @@
 class PassInfo {
   const char           *PassName;      // Nice name for Pass
   const char           *PassArgument;  // Command Line argument to run this pass
-  const std::type_info &TypeInfo;      // type_info object for this Pass class
+  intptr_t             PassID;      
   bool IsCFGOnlyPass;                  // Pass only looks at the CFG.
   bool IsAnalysisGroup;                // True if an analysis group.
   std::vector ItfImpl;// Interfaces implemented by this pass
 
-  Pass *(*NormalCtor)();               // No argument ctor
+  Pass *(*NormalCtor)();
 
 public:
   /// PassInfo ctor - Do not call this directly, this should only be invoked
   /// through RegisterPass.
-  PassInfo(const char *name, const char *arg, const std::type_info &ti,
+  PassInfo(const char *name, const char *arg, intptr_t pi,
            Pass *(*normal)() = 0, bool isCFGOnly = false)
-    : PassName(name), PassArgument(arg), TypeInfo(ti), 
+    : PassName(name), PassArgument(arg), PassID(pi), 
       IsCFGOnlyPass(isCFGOnly), IsAnalysisGroup(false), NormalCtor(normal) {
   }
 
@@ -65,8 +65,8 @@
   const char *getPassArgument() const { return PassArgument; }
 
   /// getTypeInfo - Return the type_info object for the pass...
-  ///
-  const std::type_info &getTypeInfo() const { return TypeInfo; }
+  /// TODO : Rename
+  intptr_t getTypeInfo() const { return PassID; }
 
   /// isAnalysisGroup - Return true if this is an analysis group, not a normal
   /// pass.
@@ -139,12 +139,12 @@
 
   typedef Pass* (*NormalCtor_t)();
   
-  RegisterPassBase(const char *Name, const char *Arg, const std::type_info &TI,
+  RegisterPassBase(const char *Name, const char *Arg, intptr_t TI,
                    NormalCtor_t NormalCtor = 0, bool CFGOnly = false)
     : PIObj(Name, Arg, TI, NormalCtor, CFGOnly) {
     registerPass();
   }
-  RegisterPassBase(const std::type_info &TI)
+  RegisterPassBase(intptr_t TI)
     : PIObj("", "", TI) {
     // This ctor may only be used for analysis groups: it does not auto-register
     // the pass.
@@ -165,7 +165,7 @@
 
   // Register Pass using default constructor...
   RegisterPass(const char *PassArg, const char *Name, bool CFGOnly = false)
-  : RegisterPassBase(Name, PassArg, typeid(PassName),
+    : RegisterPassBase(Name, PassArg, (intptr_t)&PassName::ID,
                      (RegisterPassBase::NormalCtor_t)callDefaultCtor, CFGOnly) {
   }
 };
@@ -195,8 +195,8 @@
   const PassInfo *ImplementationInfo;
   bool isDefaultImplementation;
 protected:
-  explicit RegisterAGBase(const std::type_info &Interface,
-                          const std::type_info *Pass = 0,
+  explicit RegisterAGBase(intptr_t InterfaceID,
+                          intptr_t PassID = 0,
                           bool isDefault = false);
   void setGroupName(const char *Name);
 };
@@ -204,12 +204,12 @@
 template
 struct RegisterAnalysisGroup : public RegisterAGBase {
   explicit RegisterAnalysisGroup(RegisterPassBase &RPB)
-    : RegisterAGBase(typeid(Interface), &RPB.getPassInfo()->getTypeInfo(), 
+    : RegisterAGBase((intptr_t) &Interface::ID, RPB.getPassInfo()->getTypeInfo(),
                      Default) {
   }
 
   explicit RegisterAnalysisGroup(const char *Name)
-  : RegisterAGBase(typeid(Interface)) {
+    : RegisterAGBase((intptr_t) &Interface::ID) {
     setGroupName(Name);
   }
 };





From reid at x10sys.com  Wed May  2 16:29:57 2007
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 2 May 2007 16:29:57 -0500
Subject: [llvm-commits] CVS: llvm/Makefile.rules
Message-ID: <200705022129.l42LTv31023825@zion.cs.uiuc.edu>



Changes in directory llvm:

Makefile.rules updated: 1.432 -> 1.433
---
Log message:

Add a rule to get the footprint of binaries and libraries.


---
Diffs of the changes:  (+14 -0)

 Makefile.rules |   14 ++++++++++++++
 1 files changed, 14 insertions(+)


Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.432 llvm/Makefile.rules:1.433
--- llvm/Makefile.rules:1.432	Mon Apr 16 13:10:22 2007
+++ llvm/Makefile.rules	Wed May  2 16:29:39 2007
@@ -244,6 +244,11 @@
   CXX.Flags += -fno-exceptions
 endif
 
+# IF REQUIRES_RTTI=1 is specified then don't disable run-time type id
+ifndef REQUIRES_RTTI
+  CXX.Flags += -fno-rtti
+endif
+
 # If DISABLE_ASSERTIONS=1 is specified (make command line or configured),
 # then disable assertions by defining the appropriate preprocessor symbols.
 ifdef DISABLE_ASSERTIONS
@@ -1730,6 +1735,15 @@
 
 check-for-tabs:
 	@egrep -n '	' $(Sources)
+check-footprint:
+	@ls -l $(LibDir) | awk '\
+	  BEGIN { sum = 0; } \
+	        { sum += $$5; } \
+	  END   { printf("Libraries: %6.3f MBytes\n", sum/(1024.0*1024.0)); }'
+	@ls -l $(ToolDir) | awk '\
+	  BEGIN { sum = 0; } \
+	        { sum += $$5; } \
+	  END   { printf("Programs:  %6.3f MBytes\n", sum/(1024.0*1024.0)); }'
 #------------------------------------------------------------------------
 # Print out the directories used for building
 #------------------------------------------------------------------------





From reid at x10sys.com  Wed May  2 16:31:27 2007
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 2 May 2007 16:31:27 -0500
Subject: [llvm-commits] CVS: llvm/Makefile.rules
Message-ID: <200705022131.l42LVRSc023874@zion.cs.uiuc.edu>



Changes in directory llvm:

Makefile.rules updated: 1.433 -> 1.434
---
Log message:

Disable RTTI handling until we're ready.


---
Diffs of the changes:  (+1 -1)

 Makefile.rules |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.433 llvm/Makefile.rules:1.434
--- llvm/Makefile.rules:1.433	Wed May  2 16:29:39 2007
+++ llvm/Makefile.rules	Wed May  2 16:31:09 2007
@@ -246,7 +246,7 @@
 
 # IF REQUIRES_RTTI=1 is specified then don't disable run-time type id
 ifndef REQUIRES_RTTI
-  CXX.Flags += -fno-rtti
+#  CXX.Flags += -fno-rtti
 endif
 
 # If DISABLE_ASSERTIONS=1 is specified (make command line or configured),





From dpatel at apple.com  Wed May  2 16:41:22 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 16:41:22 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/ARM/ARMConstantIslandPass.cpp
	ARMLoadStoreOptimizer.cpp
Message-ID: <200705022141.l42LfMNO024255@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/ARM:

ARMConstantIslandPass.cpp updated: 1.40 -> 1.41
ARMLoadStoreOptimizer.cpp updated: 1.9 -> 1.10
---
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:  (+4 -4)

 ARMConstantIslandPass.cpp |    4 ++--
 ARMLoadStoreOptimizer.cpp |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


Index: llvm/lib/Target/ARM/ARMConstantIslandPass.cpp
diff -u llvm/lib/Target/ARM/ARMConstantIslandPass.cpp:1.40 llvm/lib/Target/ARM/ARMConstantIslandPass.cpp:1.41
--- llvm/lib/Target/ARM/ARMConstantIslandPass.cpp:1.40	Tue May  1 16:15:46 2007
+++ llvm/lib/Target/ARM/ARMConstantIslandPass.cpp	Wed May  2 16:39:19 2007
@@ -128,7 +128,7 @@
     ARMFunctionInfo *AFI;
     bool isThumb;
   public:
-    static const int ID;
+    static const char ID;
     ARMConstantIslands() : MachineFunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnMachineFunction(MachineFunction &Fn);
@@ -174,7 +174,7 @@
     void dumpBBs();
     void verify(MachineFunction &Fn);
   };
-  const int ARMConstantIslands::ID = 0;
+  const char ARMConstantIslands::ID = 0;
 }
 
 /// verify - check BBOffsets, BBSizes, alignment of islands


Index: llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
diff -u llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp:1.9 llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp:1.10
--- llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp:1.9	Tue May  1 16:15:46 2007
+++ llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp	Wed May  2 16:39:19 2007
@@ -38,7 +38,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN ARMLoadStoreOpt : public MachineFunctionPass {
-    static const int ID;
+    static const char ID;
     ARMLoadStoreOpt() : MachineFunctionPass((intptr_t)&ID) {}
 
     const TargetInstrInfo *TII;
@@ -73,7 +73,7 @@
     bool LoadStoreMultipleOpti(MachineBasicBlock &MBB);
     bool MergeReturnIntoLDM(MachineBasicBlock &MBB);
   };
-  const int ARMLoadStoreOpt::ID = 0;
+  const char ARMLoadStoreOpt::ID = 0;
 }
 
 /// createARMLoadStoreOptimizationPass - returns an instance of the load / store





From dpatel at apple.com  Wed May  2 16:41:23 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 16:41:23 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/TargetData.cpp
Message-ID: <200705022141.l42LfNx6024264@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target:

TargetData.cpp updated: 1.109 -> 1.110
---
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:  (+1 -1)

 TargetData.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/lib/Target/TargetData.cpp
diff -u llvm/lib/Target/TargetData.cpp:1.109 llvm/lib/Target/TargetData.cpp:1.110
--- llvm/lib/Target/TargetData.cpp:1.109	Wed May  2 15:37:47 2007
+++ llvm/lib/Target/TargetData.cpp	Wed May  2 16:39:19 2007
@@ -35,7 +35,7 @@
   // Register the default SparcV9 implementation...
   RegisterPass X("targetdata", "Target Data Layout");
 }
-const int TargetData::ID = 0;
+const char TargetData::ID = 0;
 
 //===----------------------------------------------------------------------===//
 // Support for StructLayout





From dpatel at apple.com  Wed May  2 16:41:24 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 16:41:24 -0500
Subject: [llvm-commits] CVS: llvm/tools/bugpoint/ExtractFunction.cpp
	TestPasses.cpp
Message-ID: <200705022141.l42LfO5Z024266@zion.cs.uiuc.edu>



Changes in directory llvm/tools/bugpoint:

ExtractFunction.cpp updated: 1.59 -> 1.60
TestPasses.cpp updated: 1.11 -> 1.12
---
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:  (+6 -6)

 ExtractFunction.cpp |    4 ++--
 TestPasses.cpp      |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)


Index: llvm/tools/bugpoint/ExtractFunction.cpp
diff -u llvm/tools/bugpoint/ExtractFunction.cpp:1.59 llvm/tools/bugpoint/ExtractFunction.cpp:1.60
--- llvm/tools/bugpoint/ExtractFunction.cpp:1.59	Tue May  1 16:15:47 2007
+++ llvm/tools/bugpoint/ExtractFunction.cpp	Wed May  2 16:39:20 2007
@@ -306,10 +306,10 @@
   class BlockExtractorPass : public ModulePass {
     bool runOnModule(Module &M);
   public:
-    static const int ID; // Pass ID, replacement for typeid
+    static const char ID; // Pass ID, replacement for typeid
     BlockExtractorPass() : ModulePass((intptr_t)&ID) {}
   };
-  const int BlockExtractorPass::ID = 0;
+  const char BlockExtractorPass::ID = 0;
   RegisterPass
   XX("extract-bbs", "Extract Basic Blocks From Module (for bugpoint use)");
 }


Index: llvm/tools/bugpoint/TestPasses.cpp
diff -u llvm/tools/bugpoint/TestPasses.cpp:1.11 llvm/tools/bugpoint/TestPasses.cpp:1.12
--- llvm/tools/bugpoint/TestPasses.cpp:1.11	Tue May  1 16:15:47 2007
+++ llvm/tools/bugpoint/TestPasses.cpp	Wed May  2 16:39:20 2007
@@ -26,7 +26,7 @@
   /// crashes on any call instructions.
   class CrashOnCalls : public BasicBlockPass {
   public:
-    static const int ID; // Pass ID, replacement for typeid
+    static const char ID; // Pass ID, replacement for typeid
     CrashOnCalls() : BasicBlockPass((intptr_t)&ID) {}
   private:
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
@@ -42,7 +42,7 @@
     }
   };
 
-  const int CrashOnCalls::ID = 0;
+  const char CrashOnCalls::ID = 0;
   RegisterPass
   X("bugpoint-crashcalls",
     "BugPoint Test Pass - Intentionally crash on CallInsts");
@@ -53,7 +53,7 @@
   /// deletes some call instructions, "misoptimizing" the program.
   class DeleteCalls : public BasicBlockPass {
   public:
-    static const int ID; // Pass ID, replacement for typeid
+    static const char ID; // Pass ID, replacement for typeid
     DeleteCalls() : BasicBlockPass((intptr_t)&ID) {}
   private:
     bool runOnBasicBlock(BasicBlock &BB) {
@@ -68,7 +68,7 @@
     }
   };
  
-  const int DeleteCalls::ID = 0;
+  const char DeleteCalls::ID = 0;
   RegisterPass
   Y("bugpoint-deletecalls",
     "BugPoint Test Pass - Intentionally 'misoptimize' CallInsts");





From dpatel at apple.com  Wed May  2 16:41:24 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 16:41:24 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
Message-ID: <200705022141.l42LfOYr024271@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen/SelectionDAG:

SelectionDAGISel.cpp updated: 1.443 -> 1.444
---
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:  (+1 -1)

 SelectionDAGISel.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.443 llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.444
--- llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.443	Tue May  1 16:15:46 2007
+++ llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp	Wed May  2 16:39:19 2007
@@ -5012,4 +5012,4 @@
     Ops.push_back(InOps.back());
 }
 
-const int SelectionDAGISel::ID = 0;
+const char SelectionDAGISel::ID = 0;





From dpatel at apple.com  Wed May  2 16:41:24 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 16:41:24 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Assembly/PrintModulePass.h
Message-ID: <200705022141.l42LfOIf024273@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Assembly:

PrintModulePass.h updated: 1.22 -> 1.23
---
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:  (+2 -2)

 PrintModulePass.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm/include/llvm/Assembly/PrintModulePass.h
diff -u llvm/include/llvm/Assembly/PrintModulePass.h:1.22 llvm/include/llvm/Assembly/PrintModulePass.h:1.23
--- llvm/include/llvm/Assembly/PrintModulePass.h:1.22	Tue May  1 16:15:46 2007
+++ llvm/include/llvm/Assembly/PrintModulePass.h	Wed May  2 16:39:18 2007
@@ -28,7 +28,7 @@
   OStream *Out;           // ostream to print on
   bool DeleteStream;      // Delete the ostream in our dtor?
 public:
-  static const int ID;
+  static const char ID;
   PrintModulePass() : ModulePass((intptr_t)&ID), Out(&cerr), DeleteStream(false) {}
   PrintModulePass(OStream *o, bool DS = false)
     : ModulePass((intptr_t)&ID), Out(o), DeleteStream(DS) {}
@@ -52,7 +52,7 @@
   OStream *Out;           // ostream to print on
   bool DeleteStream;      // Delete the ostream in our dtor?
 public:
-  static const int ID;
+  static const char ID;
   PrintFunctionPass() : FunctionPass((intptr_t)&ID), Banner(""), Out(&cerr), 
                         DeleteStream(false) {}
   PrintFunctionPass(const std::string &B, OStream *o = &cout,





From dpatel at apple.com  Wed May  2 16:41:25 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 16:41:25 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86CodeEmitter.cpp
	X86FloatingPoint.cpp
Message-ID: <200705022141.l42LfPq8024287@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

X86CodeEmitter.cpp updated: 1.134 -> 1.135
X86FloatingPoint.cpp updated: 1.69 -> 1.70
---
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:  (+4 -4)

 X86CodeEmitter.cpp   |    4 ++--
 X86FloatingPoint.cpp |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


Index: llvm/lib/Target/X86/X86CodeEmitter.cpp
diff -u llvm/lib/Target/X86/X86CodeEmitter.cpp:1.134 llvm/lib/Target/X86/X86CodeEmitter.cpp:1.135
--- llvm/lib/Target/X86/X86CodeEmitter.cpp:1.134	Tue May  1 16:15:46 2007
+++ llvm/lib/Target/X86/X86CodeEmitter.cpp	Wed May  2 16:39:19 2007
@@ -39,7 +39,7 @@
     MachineCodeEmitter  &MCE;
     bool Is64BitMode;
   public:
-    static const int ID;
+    static const char ID;
     explicit Emitter(TargetMachine &tm, MachineCodeEmitter &mce)
       : MachineFunctionPass((intptr_t)&ID), II(0), TD(0), TM(tm), 
       MCE(mce), Is64BitMode(false) {}
@@ -82,7 +82,7 @@
     bool isX86_64ExtendedReg(const MachineOperand &MO);
     unsigned determineREX(const MachineInstr &MI);
   };
-  const int Emitter::ID = 0;
+  const char Emitter::ID = 0;
 }
 
 /// createX86CodeEmitterPass - Return a pass that emits the collected X86 code


Index: llvm/lib/Target/X86/X86FloatingPoint.cpp
diff -u llvm/lib/Target/X86/X86FloatingPoint.cpp:1.69 llvm/lib/Target/X86/X86FloatingPoint.cpp:1.70
--- llvm/lib/Target/X86/X86FloatingPoint.cpp:1.69	Tue May  1 16:15:46 2007
+++ llvm/lib/Target/X86/X86FloatingPoint.cpp	Wed May  2 16:39:19 2007
@@ -52,7 +52,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN FPS : public MachineFunctionPass {
-    static const int ID;
+    static const char ID;
     FPS() : MachineFunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnMachineFunction(MachineFunction &MF);
@@ -154,7 +154,7 @@
     void handleCondMovFP(MachineBasicBlock::iterator &I);
     void handleSpecialFP(MachineBasicBlock::iterator &I);
   };
-  const int FPS::ID = 0;
+  const char FPS::ID = 0;
 }
 
 FunctionPass *llvm::createX86FloatingPointStackifierPass() { return new FPS(); }





From dpatel at apple.com  Wed May  2 16:41:25 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 16:41:25 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/Sparc/DelaySlotFiller.cpp
	FPMover.cpp
Message-ID: <200705022141.l42LfPw3024293@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/Sparc:

DelaySlotFiller.cpp updated: 1.14 -> 1.15
FPMover.cpp updated: 1.19 -> 1.20
---
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:  (+4 -4)

 DelaySlotFiller.cpp |    4 ++--
 FPMover.cpp         |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


Index: llvm/lib/Target/Sparc/DelaySlotFiller.cpp
diff -u llvm/lib/Target/Sparc/DelaySlotFiller.cpp:1.14 llvm/lib/Target/Sparc/DelaySlotFiller.cpp:1.15
--- llvm/lib/Target/Sparc/DelaySlotFiller.cpp:1.14	Tue May  1 16:15:46 2007
+++ llvm/lib/Target/Sparc/DelaySlotFiller.cpp	Wed May  2 16:39:19 2007
@@ -30,7 +30,7 @@
     TargetMachine &TM;
     const TargetInstrInfo *TII;
 
-    static const int ID;
+    static const char ID;
     Filler(TargetMachine &tm) 
       : MachineFunctionPass((intptr_t)&ID), TM(tm), TII(tm.getInstrInfo()) { }
 
@@ -48,7 +48,7 @@
     }
 
   };
-  const int Filler::ID = 0;
+  const char Filler::ID = 0;
 } // end of anonymous namespace
 
 /// createSparcDelaySlotFillerPass - Returns a pass that fills in delay


Index: llvm/lib/Target/Sparc/FPMover.cpp
diff -u llvm/lib/Target/Sparc/FPMover.cpp:1.19 llvm/lib/Target/Sparc/FPMover.cpp:1.20
--- llvm/lib/Target/Sparc/FPMover.cpp:1.19	Tue May  1 16:15:46 2007
+++ llvm/lib/Target/Sparc/FPMover.cpp	Wed May  2 16:39:19 2007
@@ -32,7 +32,7 @@
     ///
     TargetMachine &TM;
     
-    static const int ID;
+    static const char ID;
     FPMover(TargetMachine &tm) 
       : MachineFunctionPass((intptr_t)&ID), TM(tm) { }
 
@@ -43,7 +43,7 @@
     bool runOnMachineBasicBlock(MachineBasicBlock &MBB);
     bool runOnMachineFunction(MachineFunction &F);
   };
-  const int FPMover::ID = 0;
+  const char FPMover::ID = 0;
 } // end of anonymous namespace
 
 /// createSparcFPMoverPass - Returns a pass that turns FpMOVD





From dpatel at apple.com  Wed May  2 16:41:26 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 16:41:26 -0500
Subject: [llvm-commits] CVS: llvm/docs/WritingAnLLVMPass.html
Message-ID: <200705022141.l42LfQN8024298@zion.cs.uiuc.edu>



Changes in directory llvm/docs:

WritingAnLLVMPass.html updated: 1.57 -> 1.58
---
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:  (+4 -4)

 WritingAnLLVMPass.html |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Index: llvm/docs/WritingAnLLVMPass.html
diff -u llvm/docs/WritingAnLLVMPass.html:1.57 llvm/docs/WritingAnLLVMPass.html:1.58
--- llvm/docs/WritingAnLLVMPass.html:1.57	Tue May  1 15:55:38 2007
+++ llvm/docs/WritingAnLLVMPass.html	Wed May  2 16:39:18 2007
@@ -263,7 +263,7 @@
 time.
 
 -     static const int ID;
+     static const char ID;
      Hello() : FunctionPass((intptr_t)&ID) {}
 

 
@@ -285,7 +285,7 @@
 function.
 
 -  const int Hello::ID = 0;
+  const char Hello::ID = 0;
 
 
  We initialize pass ID here. LLVM uses ID's address to identify pass so 
@@ -311,7 +311,7 @@
 namespace {
   struct Hello : public FunctionPass {
     
-    static const int ID;
+    static const char ID;
     Hello() : FunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnFunction(Function &F) {
@@ -1807,7 +1807,7 @@
 
   Chris Lattner

   The LLVM Compiler Infrastructure

-  Last modified: $Date: 2007/05/01 20:55:38 $
+  Last modified: $Date: 2007/05/02 21:39:18 $
 
 
 





From dpatel at apple.com  Wed May  2 16:41:26 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 16:41:26 -0500
Subject: [llvm-commits] CVS: llvm/lib/Bytecode/Writer/Writer.cpp
Message-ID: <200705022141.l42LfQN1024306@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Bytecode/Writer:

Writer.cpp updated: 1.180 -> 1.181
---
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:  (+1 -1)

 Writer.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/lib/Bytecode/Writer/Writer.cpp
diff -u llvm/lib/Bytecode/Writer/Writer.cpp:1.180 llvm/lib/Bytecode/Writer/Writer.cpp:1.181
--- llvm/lib/Bytecode/Writer/Writer.cpp:1.180	Tue May  1 16:15:46 2007
+++ llvm/lib/Bytecode/Writer/Writer.cpp	Wed May  2 16:39:18 2007
@@ -47,7 +47,7 @@
 /// @brief The bytecode version number
 const unsigned BCVersionNum = 7;
 
-const int WriteBytecodePass::ID = 0;
+const char WriteBytecodePass::ID = 0;
 static RegisterPass X("emitbytecode", "Bytecode Writer");
 
 STATISTIC(BytesWritten, "Number of bytecode bytes written");





From dpatel at apple.com  Wed May  2 16:41:27 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 16:41:27 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Instrumentation/BlockProfiling.cpp
	EdgeProfiling.cpp RSProfiling.cpp RSProfiling.h
Message-ID: <200705022141.l42LfR2n024318@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Instrumentation:

BlockProfiling.cpp updated: 1.23 -> 1.24
EdgeProfiling.cpp updated: 1.13 -> 1.14
RSProfiling.cpp updated: 1.25 -> 1.26
RSProfiling.h updated: 1.5 -> 1.6
---
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:  (+12 -12)

 BlockProfiling.cpp |    8 ++++----
 EdgeProfiling.cpp  |    4 ++--
 RSProfiling.cpp    |   10 +++++-----
 RSProfiling.h      |    2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)


Index: llvm/lib/Transforms/Instrumentation/BlockProfiling.cpp
diff -u llvm/lib/Transforms/Instrumentation/BlockProfiling.cpp:1.23 llvm/lib/Transforms/Instrumentation/BlockProfiling.cpp:1.24
--- llvm/lib/Transforms/Instrumentation/BlockProfiling.cpp:1.23	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Instrumentation/BlockProfiling.cpp	Wed May  2 16:39:19 2007
@@ -33,11 +33,11 @@
 namespace {
   class VISIBILITY_HIDDEN FunctionProfiler : public RSProfilers_std {
   public:
-    static const int ID;
+    static const char ID;
     bool runOnModule(Module &M);
   };
 
-  const int FunctionProfiler::ID = 0;
+  const char FunctionProfiler::ID = 0;
 
   RegisterPass X("insert-function-profiling",
                                "Insert instrumentation for function profiling");
@@ -84,10 +84,10 @@
   class BlockProfiler : public RSProfilers_std {
     bool runOnModule(Module &M);
   public:
-    static const int ID;
+    static const char ID;
   };
 
-  const int BlockProfiler::ID = 0;
+  const char BlockProfiler::ID = 0;
   RegisterPass Y("insert-block-profiling",
                                 "Insert instrumentation for block profiling");
   RegisterAnalysisGroup YG(Y);


Index: llvm/lib/Transforms/Instrumentation/EdgeProfiling.cpp
diff -u llvm/lib/Transforms/Instrumentation/EdgeProfiling.cpp:1.13 llvm/lib/Transforms/Instrumentation/EdgeProfiling.cpp:1.14
--- llvm/lib/Transforms/Instrumentation/EdgeProfiling.cpp:1.13	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Instrumentation/EdgeProfiling.cpp	Wed May  2 16:39:19 2007
@@ -33,11 +33,11 @@
   class VISIBILITY_HIDDEN EdgeProfiler : public ModulePass {
     bool runOnModule(Module &M);
   public:
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     EdgeProfiler() : ModulePass((intptr_t)&ID) {}
   };
 
-  const int EdgeProfiler::ID = 0;
+  const char EdgeProfiler::ID = 0;
   RegisterPass X("insert-edge-profiling",
                                "Insert instrumentation for edge profiling");
 }


Index: llvm/lib/Transforms/Instrumentation/RSProfiling.cpp
diff -u llvm/lib/Transforms/Instrumentation/RSProfiling.cpp:1.25 llvm/lib/Transforms/Instrumentation/RSProfiling.cpp:1.26
--- llvm/lib/Transforms/Instrumentation/RSProfiling.cpp:1.25	Wed May  2 15:37:47 2007
+++ llvm/lib/Transforms/Instrumentation/RSProfiling.cpp	Wed May  2 16:39:19 2007
@@ -69,7 +69,7 @@
   /// measuring framework overhead
   class VISIBILITY_HIDDEN NullProfilerRS : public RSProfilers {
   public:
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     bool isProfiling(Value* v) {
       return false;
     }
@@ -139,7 +139,7 @@
 
   /// ProfilerRS - Insert the random sampling framework
   struct VISIBILITY_HIDDEN ProfilerRS : public FunctionPass {
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     ProfilerRS() : FunctionPass((intptr_t)&ID) {}
 
     std::map TransCache;
@@ -162,9 +162,9 @@
                              "Insert random sampling instrumentation framework");
 }
 
-const int RSProfilers::ID = 0;
-const int NullProfilerRS::ID = 0;
-const int ProfilerRS::ID = 0;
+const char RSProfilers::ID = 0;
+const char NullProfilerRS::ID = 0;
+const char ProfilerRS::ID = 0;
 
 //Local utilities
 static void ReplacePhiPred(BasicBlock* btarget, 


Index: llvm/lib/Transforms/Instrumentation/RSProfiling.h
diff -u llvm/lib/Transforms/Instrumentation/RSProfiling.h:1.5 llvm/lib/Transforms/Instrumentation/RSProfiling.h:1.6
--- llvm/lib/Transforms/Instrumentation/RSProfiling.h:1.5	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Instrumentation/RSProfiling.h	Wed May  2 16:39:19 2007
@@ -17,7 +17,7 @@
   /// RSProfilers_std - a simple support class for profilers that handles most
   /// of the work of chaining and tracking inserted code.
   struct RSProfilers_std : public RSProfilers {
-    static const int ID;
+    static const char ID;
     std::set profcode;
     // Lookup up values in profcode
     virtual bool isProfiling(Value* v);





From dpatel at apple.com  Wed May  2 16:41:29 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 16:41:29 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Bytecode/WriteBytecodePass.h
Message-ID: <200705022141.l42LfTnh024351@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Bytecode:

WriteBytecodePass.h updated: 1.20 -> 1.21
---
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:  (+1 -1)

 WriteBytecodePass.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/include/llvm/Bytecode/WriteBytecodePass.h
diff -u llvm/include/llvm/Bytecode/WriteBytecodePass.h:1.20 llvm/include/llvm/Bytecode/WriteBytecodePass.h:1.21
--- llvm/include/llvm/Bytecode/WriteBytecodePass.h:1.20	Tue May  1 16:15:46 2007
+++ llvm/include/llvm/Bytecode/WriteBytecodePass.h	Wed May  2 16:39:18 2007
@@ -26,7 +26,7 @@
   bool DeleteStream;
   bool CompressFile;
 public:
-  static const int ID; // Pass identifcation, replacement for typeid
+  static const char ID; // Pass identifcation, replacement for typeid
   WriteBytecodePass()
     : ModulePass((intptr_t) &ID), Out(&cout), DeleteStream(false), 
       CompressFile(false) {}





From dpatel at apple.com  Wed May  2 16:41:27 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 16:41:27 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/MSIL/MSILWriter.cpp MSILWriter.h
Message-ID: <200705022141.l42LfRdw024323@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/MSIL:

MSILWriter.cpp updated: 1.5 -> 1.6
MSILWriter.h updated: 1.3 -> 1.4
---
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:  (+4 -4)

 MSILWriter.cpp |    4 ++--
 MSILWriter.h   |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


Index: llvm/lib/Target/MSIL/MSILWriter.cpp
diff -u llvm/lib/Target/MSIL/MSILWriter.cpp:1.5 llvm/lib/Target/MSIL/MSILWriter.cpp:1.6
--- llvm/lib/Target/MSIL/MSILWriter.cpp:1.5	Tue May  1 16:15:46 2007
+++ llvm/lib/Target/MSIL/MSILWriter.cpp	Wed May  2 16:39:19 2007
@@ -80,8 +80,8 @@
   return Changed;
 }
 
-const int MSILModule::ID = 0;
-const int MSILWriter::ID = 0;
+const char MSILModule::ID = 0;
+const char MSILWriter::ID = 0;
 
 bool MSILWriter::runOnFunction(Function &F) {
   if (F.isDeclaration()) return false;


Index: llvm/lib/Target/MSIL/MSILWriter.h
diff -u llvm/lib/Target/MSIL/MSILWriter.h:1.3 llvm/lib/Target/MSIL/MSILWriter.h:1.4
--- llvm/lib/Target/MSIL/MSILWriter.h:1.3	Tue May  1 16:15:46 2007
+++ llvm/lib/Target/MSIL/MSILWriter.h	Wed May  2 16:39:19 2007
@@ -37,7 +37,7 @@
     const TargetData*& TD;
 
   public:
-    static const int ID;
+    static const char ID;
     MSILModule(const std::set*& _UsedTypes,
                const TargetData*& _TD)
       : ModulePass((intptr_t)&ID), UsedTypes(_UsedTypes), TD(_TD) {}
@@ -83,7 +83,7 @@
     std::map >
       StaticInitList;
     const std::set* UsedTypes;
-    static const int ID;
+    static const char ID;
     MSILWriter(std::ostream &o) : FunctionPass((intptr_t)&ID), Out(o) {
       UniqID = 0;
     }





From dpatel at apple.com  Wed May  2 16:41:29 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 16:41:29 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Analysis/AliasAnalysis.h
	CallGraph.h Dominators.h FindUsedTypes.h IntervalPartition.h
	LoopInfo.h LoopPass.h PostDominators.h ProfileInfo.h
	ScalarEvolution.h ValueNumbering.h
Message-ID: <200705022141.l42LfTR7024376@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Analysis:

AliasAnalysis.h updated: 1.29 -> 1.30
CallGraph.h updated: 1.54 -> 1.55
Dominators.h updated: 1.77 -> 1.78
FindUsedTypes.h updated: 1.30 -> 1.31
IntervalPartition.h updated: 1.24 -> 1.25
LoopInfo.h updated: 1.64 -> 1.65
LoopPass.h updated: 1.16 -> 1.17
PostDominators.h updated: 1.18 -> 1.19
ProfileInfo.h updated: 1.6 -> 1.7
ScalarEvolution.h updated: 1.17 -> 1.18
ValueNumbering.h updated: 1.11 -> 1.12
---
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:  (+15 -15)

 AliasAnalysis.h     |    2 +-
 CallGraph.h         |    2 +-
 Dominators.h        |    6 +++---
 FindUsedTypes.h     |    2 +-
 IntervalPartition.h |    2 +-
 LoopInfo.h          |    2 +-
 LoopPass.h          |    2 +-
 PostDominators.h    |    6 +++---
 ProfileInfo.h       |    2 +-
 ScalarEvolution.h   |    2 +-
 ValueNumbering.h    |    2 +-
 11 files changed, 15 insertions(+), 15 deletions(-)


Index: llvm/include/llvm/Analysis/AliasAnalysis.h
diff -u llvm/include/llvm/Analysis/AliasAnalysis.h:1.29 llvm/include/llvm/Analysis/AliasAnalysis.h:1.30
--- llvm/include/llvm/Analysis/AliasAnalysis.h:1.29	Tue May  1 16:15:46 2007
+++ llvm/include/llvm/Analysis/AliasAnalysis.h	Wed May  2 16:39:18 2007
@@ -61,7 +61,7 @@
   virtual void getAnalysisUsage(AnalysisUsage &AU) const;
 
 public:
-  static const int ID; // Class identification, replacement for typeinfo
+  static const char ID; // Class identification, replacement for typeinfo
   AliasAnalysis() : TD(0), AA(0) {}
   virtual ~AliasAnalysis();  // We want to be subclassed
 


Index: llvm/include/llvm/Analysis/CallGraph.h
diff -u llvm/include/llvm/Analysis/CallGraph.h:1.54 llvm/include/llvm/Analysis/CallGraph.h:1.55
--- llvm/include/llvm/Analysis/CallGraph.h:1.54	Tue May  1 16:15:46 2007
+++ llvm/include/llvm/Analysis/CallGraph.h	Wed May  2 16:39:18 2007
@@ -73,7 +73,7 @@
   FunctionMapTy FunctionMap;    // Map from a function to its node
 
 public:
-  static const int ID; // Class identification, replacement for typeinfo
+  static const char ID; // Class identification, replacement for typeinfo
   //===---------------------------------------------------------------------
   // Accessors...
   //


Index: llvm/include/llvm/Analysis/Dominators.h
diff -u llvm/include/llvm/Analysis/Dominators.h:1.77 llvm/include/llvm/Analysis/Dominators.h:1.78
--- llvm/include/llvm/Analysis/Dominators.h:1.77	Tue May  1 16:15:46 2007
+++ llvm/include/llvm/Analysis/Dominators.h	Wed May  2 16:39:18 2007
@@ -208,7 +208,7 @@
 ///
 class DominatorTree : public DominatorTreeBase {
 public:
-  static const int ID; // Pass ID, replacement for typeid
+  static const char ID; // Pass ID, replacement for typeid
   DominatorTree() : DominatorTreeBase((intptr_t)&ID, false) {}
   
   BasicBlock *getRoot() const {
@@ -399,7 +399,7 @@
 
 class ETForest : public ETForestBase {
 public:
-  static const int ID; // Pass identifcation, replacement for typeid
+  static const char ID; // Pass identifcation, replacement for typeid
 
   ETForest() : ETForestBase((intptr_t)&ID, false) {}
 
@@ -477,7 +477,7 @@
 ///
 class DominanceFrontier : public DominanceFrontierBase {
 public:
-  static const int ID; // Pass ID, replacement for typeid
+  static const char ID; // Pass ID, replacement for typeid
   DominanceFrontier() : 
     DominanceFrontierBase((intptr_t)& ID, false) {}
 


Index: llvm/include/llvm/Analysis/FindUsedTypes.h
diff -u llvm/include/llvm/Analysis/FindUsedTypes.h:1.30 llvm/include/llvm/Analysis/FindUsedTypes.h:1.31
--- llvm/include/llvm/Analysis/FindUsedTypes.h:1.30	Tue May  1 16:15:46 2007
+++ llvm/include/llvm/Analysis/FindUsedTypes.h	Wed May  2 16:39:18 2007
@@ -24,7 +24,7 @@
 class FindUsedTypes : public ModulePass {
   std::set UsedTypes;
 public:
-  static const int ID; // Pass identifcation, replacement for typeid
+  static const char ID; // Pass identifcation, replacement for typeid
   FindUsedTypes() : ModulePass((intptr_t)&ID) {}
 
   /// getTypes - After the pass has been run, return the set containing all of


Index: llvm/include/llvm/Analysis/IntervalPartition.h
diff -u llvm/include/llvm/Analysis/IntervalPartition.h:1.24 llvm/include/llvm/Analysis/IntervalPartition.h:1.25
--- llvm/include/llvm/Analysis/IntervalPartition.h:1.24	Tue May  1 16:15:46 2007
+++ llvm/include/llvm/Analysis/IntervalPartition.h	Wed May  2 16:39:18 2007
@@ -45,7 +45,7 @@
   std::vector Intervals;
 
 public:
-  static const int ID; // Pass identifcation, replacement for typeid
+  static const char ID; // Pass identifcation, replacement for typeid
 
   IntervalPartition() : FunctionPass((intptr_t)&ID), RootInterval(0) {}
 


Index: llvm/include/llvm/Analysis/LoopInfo.h
diff -u llvm/include/llvm/Analysis/LoopInfo.h:1.64 llvm/include/llvm/Analysis/LoopInfo.h:1.65
--- llvm/include/llvm/Analysis/LoopInfo.h:1.64	Tue May  1 16:15:46 2007
+++ llvm/include/llvm/Analysis/LoopInfo.h	Wed May  2 16:39:18 2007
@@ -241,7 +241,7 @@
   std::vector TopLevelLoops;
   friend class Loop;
 public:
-  static const int ID; // Pass identifcation, replacement for typeid
+  static const char ID; // Pass identifcation, replacement for typeid
 
   LoopInfo() : FunctionPass((intptr_t)&ID) {}
   ~LoopInfo() { releaseMemory(); }


Index: llvm/include/llvm/Analysis/LoopPass.h
diff -u llvm/include/llvm/Analysis/LoopPass.h:1.16 llvm/include/llvm/Analysis/LoopPass.h:1.17
--- llvm/include/llvm/Analysis/LoopPass.h:1.16	Tue May  1 16:15:46 2007
+++ llvm/include/llvm/Analysis/LoopPass.h	Wed May  2 16:39:18 2007
@@ -68,7 +68,7 @@
 class LPPassManager : public FunctionPass, public PMDataManager {
 
 public:
-  static const int ID;
+  static const char ID;
   LPPassManager(int Depth);
 
   /// run - Execute all of the passes scheduled for execution.  Keep track of


Index: llvm/include/llvm/Analysis/PostDominators.h
diff -u llvm/include/llvm/Analysis/PostDominators.h:1.18 llvm/include/llvm/Analysis/PostDominators.h:1.19
--- llvm/include/llvm/Analysis/PostDominators.h:1.18	Tue May  1 16:15:46 2007
+++ llvm/include/llvm/Analysis/PostDominators.h	Wed May  2 16:39:18 2007
@@ -22,7 +22,7 @@
 /// compute the a post-dominator tree.
 ///
 struct PostDominatorTree : public DominatorTreeBase {
-  static const int ID; // Pass identifcation, replacement for typeid
+  static const char ID; // Pass identifcation, replacement for typeid
 
   PostDominatorTree() : 
     DominatorTreeBase((intptr_t)&ID, true) {}
@@ -54,7 +54,7 @@
 /// PostETForest Class - Concrete subclass of ETForestBase that is used to
 /// compute a forwards post-dominator ET-Forest.
 struct PostETForest : public ETForestBase {
-  static const int ID;
+  static const char ID;
   PostETForest() : ETForestBase((intptr_t)&ID, true) {}
 
   virtual void getAnalysisUsage(AnalysisUsage &AU) const {
@@ -79,7 +79,7 @@
 /// used to compute the a post-dominance frontier.
 ///
 struct PostDominanceFrontier : public DominanceFrontierBase {
-  static const int ID;
+  static const char ID;
   PostDominanceFrontier() 
     : DominanceFrontierBase((intptr_t) &ID, true) {}
 


Index: llvm/include/llvm/Analysis/ProfileInfo.h
diff -u llvm/include/llvm/Analysis/ProfileInfo.h:1.6 llvm/include/llvm/Analysis/ProfileInfo.h:1.7
--- llvm/include/llvm/Analysis/ProfileInfo.h:1.6	Tue May  1 16:15:46 2007
+++ llvm/include/llvm/Analysis/ProfileInfo.h	Wed May  2 16:39:18 2007
@@ -38,7 +38,7 @@
     // entered.
     std::map, unsigned> EdgeCounts;
   public:
-    static const int ID; // Class identification, replacement for typeinfo
+    static const char ID; // Class identification, replacement for typeinfo
     virtual ~ProfileInfo();  // We want to be subclassed
 
     //===------------------------------------------------------------------===//


Index: llvm/include/llvm/Analysis/ScalarEvolution.h
diff -u llvm/include/llvm/Analysis/ScalarEvolution.h:1.17 llvm/include/llvm/Analysis/ScalarEvolution.h:1.18
--- llvm/include/llvm/Analysis/ScalarEvolution.h:1.17	Tue May  1 16:15:46 2007
+++ llvm/include/llvm/Analysis/ScalarEvolution.h	Wed May  2 16:39:18 2007
@@ -197,7 +197,7 @@
   class ScalarEvolution : public FunctionPass {
     void *Impl;    // ScalarEvolution uses the pimpl pattern
   public:
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     ScalarEvolution() : FunctionPass((intptr_t)&ID), Impl(0) {}
 
     /// getSCEV - Return a SCEV expression handle for the full generality of the


Index: llvm/include/llvm/Analysis/ValueNumbering.h
diff -u llvm/include/llvm/Analysis/ValueNumbering.h:1.11 llvm/include/llvm/Analysis/ValueNumbering.h:1.12
--- llvm/include/llvm/Analysis/ValueNumbering.h:1.11	Tue May  1 16:15:46 2007
+++ llvm/include/llvm/Analysis/ValueNumbering.h	Wed May  2 16:39:18 2007
@@ -29,7 +29,7 @@
 class Instruction;
 
 struct ValueNumbering {
-  static const int ID; // Class identification, replacement for typeinfo
+  static const char ID; // Class identification, replacement for typeinfo
   virtual ~ValueNumbering();    // We want to be subclassed
 
   /// getEqualNumberNodes - Return nodes with the same value number as the





From dpatel at apple.com  Wed May  2 16:41:31 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 16:41:31 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Target/TargetData.h
Message-ID: <200705022141.l42LfV12024397@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Target:

TargetData.h updated: 1.61 -> 1.62
---
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:  (+1 -1)

 TargetData.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/include/llvm/Target/TargetData.h
diff -u llvm/include/llvm/Target/TargetData.h:1.61 llvm/include/llvm/Target/TargetData.h:1.62
--- llvm/include/llvm/Target/TargetData.h:1.61	Tue May  1 16:15:46 2007
+++ llvm/include/llvm/Target/TargetData.h	Wed May  2 16:39:18 2007
@@ -202,7 +202,7 @@
   /// requested alignment (if the global has one).
   unsigned getPreferredAlignmentLog(const GlobalVariable *GV) const;
 
-  static const int ID; // Pass identifcation, replacement for typeid
+  static const char ID; // Pass identifcation, replacement for typeid
 };
 
 /// StructLayout - used to lazily calculate structure layout information for a





From dpatel at apple.com  Wed May  2 16:41:31 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 16:41:31 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/PassManagers.h
Message-ID: <200705022141.l42LfV7E024402@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

PassManagers.h updated: 1.17 -> 1.18
---
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:  (+1 -1)

 PassManagers.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/include/llvm/PassManagers.h
diff -u llvm/include/llvm/PassManagers.h:1.17 llvm/include/llvm/PassManagers.h:1.18
--- llvm/include/llvm/PassManagers.h:1.17	Tue May  1 16:15:46 2007
+++ llvm/include/llvm/PassManagers.h	Wed May  2 16:39:18 2007
@@ -336,7 +336,7 @@
 class FPPassManager : public ModulePass, public PMDataManager {
  
 public:
-  static const int ID;
+  static const char ID;
   explicit FPPassManager(int Depth) 
   : ModulePass((intptr_t)&ID), PMDataManager(Depth) { }
   





From dpatel at apple.com  Wed May  2 16:41:27 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 16:41:27 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/CodeGen/AsmPrinter.h
	LiveIntervalAnalysis.h LiveVariables.h MachineModuleInfo.h
	SelectionDAGISel.h
Message-ID: <200705022141.l42LfR7M024333@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/CodeGen:

AsmPrinter.h updated: 1.64 -> 1.65
LiveIntervalAnalysis.h updated: 1.81 -> 1.82
LiveVariables.h updated: 1.42 -> 1.43
MachineModuleInfo.h updated: 1.8 -> 1.9
SelectionDAGISel.h updated: 1.38 -> 1.39
---
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:  (+5 -5)

 AsmPrinter.h           |    2 +-
 LiveIntervalAnalysis.h |    2 +-
 LiveVariables.h        |    2 +-
 MachineModuleInfo.h    |    2 +-
 SelectionDAGISel.h     |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)


Index: llvm/include/llvm/CodeGen/AsmPrinter.h
diff -u llvm/include/llvm/CodeGen/AsmPrinter.h:1.64 llvm/include/llvm/CodeGen/AsmPrinter.h:1.65
--- llvm/include/llvm/CodeGen/AsmPrinter.h:1.64	Tue May  1 16:15:46 2007
+++ llvm/include/llvm/CodeGen/AsmPrinter.h	Wed May  2 16:39:18 2007
@@ -34,7 +34,7 @@
   /// AsmPrinter - This class is intended to be used as a driving class for all
   /// asm writers.
   class AsmPrinter : public MachineFunctionPass {
-    static const int ID;
+    static const char ID;
 
     /// FunctionNumber - This provides a unique ID for each function emitted in
     /// this translation unit.  It is autoincremented by SetupMachineFunction,


Index: llvm/include/llvm/CodeGen/LiveIntervalAnalysis.h
diff -u llvm/include/llvm/CodeGen/LiveIntervalAnalysis.h:1.81 llvm/include/llvm/CodeGen/LiveIntervalAnalysis.h:1.82
--- llvm/include/llvm/CodeGen/LiveIntervalAnalysis.h:1.81	Tue May  1 16:15:46 2007
+++ llvm/include/llvm/CodeGen/LiveIntervalAnalysis.h	Wed May  2 16:39:18 2007
@@ -65,7 +65,7 @@
     BitVector JoinedLIs;
 
   public:
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     LiveIntervals() : MachineFunctionPass((intptr_t)&ID) {}
 
     struct CopyRec {


Index: llvm/include/llvm/CodeGen/LiveVariables.h
diff -u llvm/include/llvm/CodeGen/LiveVariables.h:1.42 llvm/include/llvm/CodeGen/LiveVariables.h:1.43
--- llvm/include/llvm/CodeGen/LiveVariables.h:1.42	Tue May  1 16:15:46 2007
+++ llvm/include/llvm/CodeGen/LiveVariables.h	Wed May  2 16:39:18 2007
@@ -40,7 +40,7 @@
 
 class LiveVariables : public MachineFunctionPass {
 public:
-  static const int ID; // Pass identifcation, replacement for typeid
+  static const char ID; // Pass identifcation, replacement for typeid
   LiveVariables() : MachineFunctionPass((intptr_t)&ID) {}
 
   /// VarInfo - This represents the regions where a virtual register is live in


Index: llvm/include/llvm/CodeGen/MachineModuleInfo.h
diff -u llvm/include/llvm/CodeGen/MachineModuleInfo.h:1.8 llvm/include/llvm/CodeGen/MachineModuleInfo.h:1.9
--- llvm/include/llvm/CodeGen/MachineModuleInfo.h:1.8	Tue May  1 16:15:46 2007
+++ llvm/include/llvm/CodeGen/MachineModuleInfo.h	Wed May  2 16:39:18 2007
@@ -1022,7 +1022,7 @@
   std::vector TypeInfos;
 
 public:
-  static const int ID; // Pass identifcation, replacement for typeid
+  static const char ID; // Pass identifcation, replacement for typeid
 
   MachineModuleInfo();
   ~MachineModuleInfo();


Index: llvm/include/llvm/CodeGen/SelectionDAGISel.h
diff -u llvm/include/llvm/CodeGen/SelectionDAGISel.h:1.38 llvm/include/llvm/CodeGen/SelectionDAGISel.h:1.39
--- llvm/include/llvm/CodeGen/SelectionDAGISel.h:1.38	Tue May  1 16:15:46 2007
+++ llvm/include/llvm/CodeGen/SelectionDAGISel.h	Wed May  2 16:39:18 2007
@@ -41,7 +41,7 @@
   MachineBasicBlock *BB;
   std::vector TopOrder;
   unsigned DAGSize;
-  static const int ID;
+  static const char ID;
 
   explicit SelectionDAGISel(TargetLowering &tli) : 
     FunctionPass((intptr_t)&ID), TLI(tli), DAGSize(0) {}





From dpatel at apple.com  Wed May  2 16:41:27 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 16:41:27 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/PowerPC/PPCBranchSelector.cpp
	PPCCodeEmitter.cpp
Message-ID: <200705022141.l42LfRZf024342@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/PowerPC:

PPCBranchSelector.cpp updated: 1.43 -> 1.44
PPCCodeEmitter.cpp updated: 1.76 -> 1.77
---
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:  (+4 -4)

 PPCBranchSelector.cpp |    4 ++--
 PPCCodeEmitter.cpp    |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


Index: llvm/lib/Target/PowerPC/PPCBranchSelector.cpp
diff -u llvm/lib/Target/PowerPC/PPCBranchSelector.cpp:1.43 llvm/lib/Target/PowerPC/PPCBranchSelector.cpp:1.44
--- llvm/lib/Target/PowerPC/PPCBranchSelector.cpp:1.43	Tue May  1 16:15:46 2007
+++ llvm/lib/Target/PowerPC/PPCBranchSelector.cpp	Wed May  2 16:39:19 2007
@@ -32,7 +32,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN PPCBSel : public MachineFunctionPass {
-    static const int ID;
+    static const char ID;
     PPCBSel() : MachineFunctionPass((intptr_t)&ID) {}
 
     /// BlockSizes - The sizes of the basic blocks in the function.
@@ -44,7 +44,7 @@
       return "PowerPC Branch Selector";
     }
   };
-  const int PPCBSel::ID = 0;
+  const char PPCBSel::ID = 0;
 }
 
 /// createPPCBranchSelectionPass - returns an instance of the Branch Selection


Index: llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp
diff -u llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp:1.76 llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp:1.77
--- llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp:1.76	Tue May  1 16:15:46 2007
+++ llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp	Wed May  2 16:39:19 2007
@@ -40,7 +40,7 @@
     int getMachineOpValue(MachineInstr &MI, MachineOperand &MO);
 
   public:
-    static const int ID;
+    static const char ID;
     PPCCodeEmitter(TargetMachine &T, MachineCodeEmitter &M)
       : MachineFunctionPass((intptr_t)&ID), TM(T), MCE(M) {}
 
@@ -64,7 +64,7 @@
     ///
     unsigned getBinaryCodeForInstr(MachineInstr &MI);
   };
-  const int PPCCodeEmitter::ID = 0;
+  const char PPCCodeEmitter::ID = 0;
 }
 
 /// createPPCCodeEmitterPass - Return a pass that emits the collected PPC code





From dpatel at apple.com  Wed May  2 16:41:30 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 16:41:30 -0500
Subject: [llvm-commits] CVS: llvm/tools/opt/AnalysisWrappers.cpp
	GraphPrinters.cpp PrintSCC.cpp opt.cpp
Message-ID: <200705022141.l42LfUOn024387@zion.cs.uiuc.edu>



Changes in directory llvm/tools/opt:

AnalysisWrappers.cpp updated: 1.22 -> 1.23
GraphPrinters.cpp updated: 1.15 -> 1.16
PrintSCC.cpp updated: 1.16 -> 1.17
opt.cpp updated: 1.135 -> 1.136
---
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:  (+16 -16)

 AnalysisWrappers.cpp |    8 ++++----
 GraphPrinters.cpp    |    4 ++--
 PrintSCC.cpp         |    8 ++++----
 opt.cpp              |   12 ++++++------
 4 files changed, 16 insertions(+), 16 deletions(-)


Index: llvm/tools/opt/AnalysisWrappers.cpp
diff -u llvm/tools/opt/AnalysisWrappers.cpp:1.22 llvm/tools/opt/AnalysisWrappers.cpp:1.23
--- llvm/tools/opt/AnalysisWrappers.cpp:1.22	Tue May  1 16:15:47 2007
+++ llvm/tools/opt/AnalysisWrappers.cpp	Wed May  2 16:39:20 2007
@@ -30,7 +30,7 @@
   /// useful when looking for standard library functions we should constant fold
   /// or handle in alias analyses.
   struct ExternalFunctionsPassedConstants : public ModulePass {
-    static const int ID; // Pass ID, replacement for typeid
+    static const char ID; // Pass ID, replacement for typeid
     ExternalFunctionsPassedConstants() : ModulePass((intptr_t)&ID) {}
     virtual bool runOnModule(Module &M) {
       for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I)
@@ -63,12 +63,12 @@
     }
   };
 
-  const int ExternalFunctionsPassedConstants::ID = 0;
+  const char ExternalFunctionsPassedConstants::ID = 0;
   RegisterPass
   P1("externalfnconstants", "Print external fn callsites passed constants");
   
   struct CallGraphPrinter : public ModulePass {
-    static const int ID; // Pass ID, replacement for typeid
+    static const char ID; // Pass ID, replacement for typeid
     CallGraphPrinter() : ModulePass((intptr_t)&ID) {}
 
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
@@ -82,7 +82,7 @@
     }
   };
   
-  const int CallGraphPrinter::ID = 0;
+  const char CallGraphPrinter::ID = 0;
   RegisterPass
     P2("callgraph", "Print a call graph");
 }


Index: llvm/tools/opt/GraphPrinters.cpp
diff -u llvm/tools/opt/GraphPrinters.cpp:1.15 llvm/tools/opt/GraphPrinters.cpp:1.16
--- llvm/tools/opt/GraphPrinters.cpp:1.15	Tue May  1 16:15:47 2007
+++ llvm/tools/opt/GraphPrinters.cpp	Wed May  2 16:39:20 2007
@@ -60,7 +60,7 @@
 
 namespace {
   struct CallGraphPrinter : public ModulePass {
-    static const int ID; // Pass ID, replacement for typeid
+    static const char ID; // Pass ID, replacement for typeid
     CallGraphPrinter() : ModulePass((intptr_t)&ID) {}
 
     virtual bool runOnModule(Module &M) {
@@ -77,7 +77,7 @@
     }
   };
 
-  const int CallGraphPrinter::ID = 0;
+  const char CallGraphPrinter::ID = 0;
   RegisterPass P2("print-callgraph",
                                     "Print Call Graph to 'dot' file");
 }


Index: llvm/tools/opt/PrintSCC.cpp
diff -u llvm/tools/opt/PrintSCC.cpp:1.16 llvm/tools/opt/PrintSCC.cpp:1.17
--- llvm/tools/opt/PrintSCC.cpp:1.16	Tue May  1 16:15:47 2007
+++ llvm/tools/opt/PrintSCC.cpp	Wed May  2 16:39:20 2007
@@ -35,7 +35,7 @@
 
 namespace {
   struct CFGSCC : public FunctionPass {
-    static const int ID;  // Pass identification, replacement for typeid
+    static const char ID;  // Pass identification, replacement for typeid
     CFGSCC() : FunctionPass((intptr_t)&ID) {}
     bool runOnFunction(Function& func);
 
@@ -47,7 +47,7 @@
   };
 
   struct CallGraphSCC : public ModulePass {
-    static const int ID;  // Pass identification, replacement for typeid
+    static const char ID;  // Pass identification, replacement for typeid
     CallGraphSCC() : ModulePass((intptr_t)&ID) {}
 
     // run - Print out SCCs in the call graph for the specified module.
@@ -62,11 +62,11 @@
     }
   };
 
-  const int CFGSCC::ID = 0;
+  const char CFGSCC::ID = 0;
   RegisterPass
   Y("cfgscc", "Print SCCs of each function CFG");
 
-  const int CallGraphSCC::ID = 0;
+  const char CallGraphSCC::ID = 0;
   RegisterPass
   Z("callscc", "Print SCCs of the Call Graph");
 }


Index: llvm/tools/opt/opt.cpp
diff -u llvm/tools/opt/opt.cpp:1.135 llvm/tools/opt/opt.cpp:1.136
--- llvm/tools/opt/opt.cpp:1.135	Tue May  1 16:15:47 2007
+++ llvm/tools/opt/opt.cpp	Wed May  2 16:39:20 2007
@@ -98,7 +98,7 @@
 namespace {
 
 struct ModulePassPrinter : public ModulePass {
-  static const int ID;
+  static const char ID;
   const PassInfo *PassToPrint;
   ModulePassPrinter(const PassInfo *PI) : ModulePass((intptr_t)&ID),
                                           PassToPrint(PI) {}
@@ -121,10 +121,10 @@
   }
 };
 
-const int ModulePassPrinter::ID = 0;
+const char ModulePassPrinter::ID = 0;
 struct FunctionPassPrinter : public FunctionPass {
   const PassInfo *PassToPrint;
-  static const int ID;
+  static const char ID;
   FunctionPassPrinter(const PassInfo *PI) : FunctionPass((intptr_t)&ID),
                                             PassToPrint(PI) {}
 
@@ -146,10 +146,10 @@
   }
 };
 
-const int FunctionPassPrinter::ID = 0;
+const char FunctionPassPrinter::ID = 0;
 struct BasicBlockPassPrinter : public BasicBlockPass {
   const PassInfo *PassToPrint;
-  static const int ID;
+  static const char ID;
   BasicBlockPassPrinter(const PassInfo *PI) 
     : BasicBlockPass((intptr_t)&ID), PassToPrint(PI) {}
 
@@ -172,7 +172,7 @@
   }
 };
 
-const int BasicBlockPassPrinter::ID = 0;
+const char BasicBlockPassPrinter::ID = 0;
 inline void addPass(PassManager &PM, Pass *P) {
   // Add the pass to the pass manager...
   PM.add(P);





From dpatel at apple.com  Wed May  2 16:41:34 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 16:41:34 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/IPO/ArgumentPromotion.cpp
	ConstantMerge.cpp DeadArgumentElimination.cpp
	DeadTypeElimination.cpp ExtractFunction.cpp GlobalDCE.cpp
	GlobalOpt.cpp IPConstantPropagation.cpp IndMemRemoval.cpp
	InlineSimple.cpp Inliner.cpp Inliner.h Internalize.cpp
	LoopExtractor.cpp LowerSetJmp.cpp PruneEH.cpp
	RaiseAllocations.cpp SimplifyLibCalls.cpp
	StripDeadPrototypes.cpp StripSymbols.cpp
Message-ID: <200705022141.l42LfYaY024457@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/IPO:

ArgumentPromotion.cpp updated: 1.40 -> 1.41
ConstantMerge.cpp updated: 1.40 -> 1.41
DeadArgumentElimination.cpp updated: 1.41 -> 1.42
DeadTypeElimination.cpp updated: 1.63 -> 1.64
ExtractFunction.cpp updated: 1.21 -> 1.22
GlobalDCE.cpp updated: 1.46 -> 1.47
GlobalOpt.cpp updated: 1.102 -> 1.103
IPConstantPropagation.cpp updated: 1.24 -> 1.25
IndMemRemoval.cpp updated: 1.16 -> 1.17
InlineSimple.cpp updated: 1.79 -> 1.80
Inliner.cpp updated: 1.38 -> 1.39
Inliner.h updated: 1.10 -> 1.11
Internalize.cpp updated: 1.46 -> 1.47
LoopExtractor.cpp updated: 1.25 -> 1.26
LowerSetJmp.cpp updated: 1.41 -> 1.42
PruneEH.cpp updated: 1.32 -> 1.33
RaiseAllocations.cpp updated: 1.41 -> 1.42
SimplifyLibCalls.cpp updated: 1.113 -> 1.114
StripDeadPrototypes.cpp updated: 1.6 -> 1.7
StripSymbols.cpp updated: 1.16 -> 1.17
---
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:  (+44 -44)

 ArgumentPromotion.cpp       |    4 ++--
 ConstantMerge.cpp           |    4 ++--
 DeadArgumentElimination.cpp |    8 ++++----
 DeadTypeElimination.cpp     |    4 ++--
 ExtractFunction.cpp         |    4 ++--
 GlobalDCE.cpp               |    4 ++--
 GlobalOpt.cpp               |    4 ++--
 IPConstantPropagation.cpp   |    4 ++--
 IndMemRemoval.cpp           |    4 ++--
 InlineSimple.cpp            |    4 ++--
 Inliner.cpp                 |    2 +-
 Inliner.h                   |    2 +-
 Internalize.cpp             |    4 ++--
 LoopExtractor.cpp           |   12 ++++++------
 LowerSetJmp.cpp             |    4 ++--
 PruneEH.cpp                 |    4 ++--
 RaiseAllocations.cpp        |    4 ++--
 SimplifyLibCalls.cpp        |    4 ++--
 StripDeadPrototypes.cpp     |    4 ++--
 StripSymbols.cpp            |    4 ++--
 20 files changed, 44 insertions(+), 44 deletions(-)


Index: llvm/lib/Transforms/IPO/ArgumentPromotion.cpp
diff -u llvm/lib/Transforms/IPO/ArgumentPromotion.cpp:1.40 llvm/lib/Transforms/IPO/ArgumentPromotion.cpp:1.41
--- llvm/lib/Transforms/IPO/ArgumentPromotion.cpp:1.40	Tue May  1 16:15:46 2007
+++ llvm/lib/Transforms/IPO/ArgumentPromotion.cpp	Wed May  2 16:39:19 2007
@@ -63,7 +63,7 @@
     }
 
     virtual bool runOnSCC(const std::vector &SCC);
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     ArgPromotion() : CallGraphSCCPass((intptr_t)&ID) {}
 
   private:
@@ -72,7 +72,7 @@
     Function *DoPromotion(Function *F, std::vector &ArgsToPromote);
   };
 
-  const int ArgPromotion::ID = 0;
+  const char ArgPromotion::ID = 0;
   RegisterPass X("argpromotion",
                                "Promote 'by reference' arguments to scalars");
 }


Index: llvm/lib/Transforms/IPO/ConstantMerge.cpp
diff -u llvm/lib/Transforms/IPO/ConstantMerge.cpp:1.40 llvm/lib/Transforms/IPO/ConstantMerge.cpp:1.41
--- llvm/lib/Transforms/IPO/ConstantMerge.cpp:1.40	Tue May  1 16:15:46 2007
+++ llvm/lib/Transforms/IPO/ConstantMerge.cpp	Wed May  2 16:39:19 2007
@@ -29,7 +29,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN ConstantMerge : public ModulePass {
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     ConstantMerge() : ModulePass((intptr_t)&ID) {}
 
     // run - For this pass, process all of the globals in the module,
@@ -38,7 +38,7 @@
     bool runOnModule(Module &M);
   };
 
-  const int ConstantMerge::ID = 0;
+  const char ConstantMerge::ID = 0;
   RegisterPassX("constmerge","Merge Duplicate Global Constants");
 }
 


Index: llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp
diff -u llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp:1.41 llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp:1.42
--- llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp:1.41	Tue May  1 16:15:46 2007
+++ llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp	Wed May  2 16:39:19 2007
@@ -76,7 +76,7 @@
     std::multimap CallSites;
 
   public:
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     DAE() : ModulePass((intptr_t)&ID) {}
     bool runOnModule(Module &M);
 
@@ -95,17 +95,17 @@
 
     void RemoveDeadArgumentsFromFunction(Function *F);
   };
-  const int DAE::ID = 0;
+  const char DAE::ID = 0;
   RegisterPass X("deadargelim", "Dead Argument Elimination");
 
   /// DAH - DeadArgumentHacking pass - Same as dead argument elimination, but
   /// deletes arguments to functions which are external.  This is only for use
   /// by bugpoint.
   struct DAH : public DAE {
-    static const int ID;
+    static const char ID;
     virtual bool ShouldHackArguments() const { return true; }
   };
-  const int DAH::ID = 0;
+  const char DAH::ID = 0;
   RegisterPass Y("deadarghaX0r",
                       "Dead Argument Hacking (BUGPOINT USE ONLY; DO NOT USE)");
 }


Index: llvm/lib/Transforms/IPO/DeadTypeElimination.cpp
diff -u llvm/lib/Transforms/IPO/DeadTypeElimination.cpp:1.63 llvm/lib/Transforms/IPO/DeadTypeElimination.cpp:1.64
--- llvm/lib/Transforms/IPO/DeadTypeElimination.cpp:1.63	Tue May  1 16:15:46 2007
+++ llvm/lib/Transforms/IPO/DeadTypeElimination.cpp	Wed May  2 16:39:19 2007
@@ -26,7 +26,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN DTE : public ModulePass {
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     DTE() : ModulePass((intptr_t)&ID) {}
 
     // doPassInitialization - For this pass, it removes global symbol table
@@ -43,7 +43,7 @@
       AU.addRequired();
     }
   };
-  const int DTE::ID = 0;
+  const char DTE::ID = 0;
   RegisterPass X("deadtypeelim", "Dead Type Elimination");
 }
 


Index: llvm/lib/Transforms/IPO/ExtractFunction.cpp
diff -u llvm/lib/Transforms/IPO/ExtractFunction.cpp:1.21 llvm/lib/Transforms/IPO/ExtractFunction.cpp:1.22
--- llvm/lib/Transforms/IPO/ExtractFunction.cpp:1.21	Tue May  1 16:15:46 2007
+++ llvm/lib/Transforms/IPO/ExtractFunction.cpp	Wed May  2 16:39:19 2007
@@ -25,7 +25,7 @@
     bool deleteFunc;
     bool reLink;
   public:
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
 
     /// FunctionExtractorPass - If deleteFn is true, this pass deletes as the
     /// specified function. Otherwise, it deletes as much of the module as
@@ -134,7 +134,7 @@
     }
   };
 
-  const int FunctionExtractorPass::ID = 0;
+  const char FunctionExtractorPass::ID = 0;
   RegisterPass X("extract", "Function Extractor");
 }
 


Index: llvm/lib/Transforms/IPO/GlobalDCE.cpp
diff -u llvm/lib/Transforms/IPO/GlobalDCE.cpp:1.46 llvm/lib/Transforms/IPO/GlobalDCE.cpp:1.47
--- llvm/lib/Transforms/IPO/GlobalDCE.cpp:1.46	Tue May  1 16:15:46 2007
+++ llvm/lib/Transforms/IPO/GlobalDCE.cpp	Wed May  2 16:39:19 2007
@@ -30,7 +30,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN GlobalDCE : public ModulePass {
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     GlobalDCE() : ModulePass((intptr_t)&ID) {}
  
     // run - Do the GlobalDCE pass on the specified module, optionally updating
@@ -49,7 +49,7 @@
     bool SafeToDestroyConstant(Constant* C);
     bool RemoveUnusedGlobalValue(GlobalValue &GV);
   };
-  const int GlobalDCE::ID = 0;
+  const char GlobalDCE::ID = 0;
   RegisterPass X("globaldce", "Dead Global Elimination");
 }
 


Index: llvm/lib/Transforms/IPO/GlobalOpt.cpp
diff -u llvm/lib/Transforms/IPO/GlobalOpt.cpp:1.102 llvm/lib/Transforms/IPO/GlobalOpt.cpp:1.103
--- llvm/lib/Transforms/IPO/GlobalOpt.cpp:1.102	Tue May  1 16:15:46 2007
+++ llvm/lib/Transforms/IPO/GlobalOpt.cpp	Wed May  2 16:39:19 2007
@@ -50,7 +50,7 @@
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
       AU.addRequired();
     }
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     GlobalOpt() : ModulePass((intptr_t)&ID) {}
 
     bool runOnModule(Module &M);
@@ -63,7 +63,7 @@
     bool ProcessInternalGlobal(GlobalVariable *GV,Module::global_iterator &GVI);
   };
 
-  const int GlobalOpt::ID = 0;
+  const char GlobalOpt::ID = 0;
   RegisterPass X("globalopt", "Global Variable Optimizer");
 }
 


Index: llvm/lib/Transforms/IPO/IPConstantPropagation.cpp
diff -u llvm/lib/Transforms/IPO/IPConstantPropagation.cpp:1.24 llvm/lib/Transforms/IPO/IPConstantPropagation.cpp:1.25
--- llvm/lib/Transforms/IPO/IPConstantPropagation.cpp:1.24	Tue May  1 16:15:46 2007
+++ llvm/lib/Transforms/IPO/IPConstantPropagation.cpp	Wed May  2 16:39:19 2007
@@ -33,7 +33,7 @@
   /// IPCP - The interprocedural constant propagation pass
   ///
   struct VISIBILITY_HIDDEN IPCP : public ModulePass {
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     IPCP() : ModulePass((intptr_t)&ID) {}
 
     bool runOnModule(Module &M);
@@ -41,7 +41,7 @@
     bool PropagateConstantsIntoArguments(Function &F);
     bool PropagateConstantReturn(Function &F);
   };
-  const int IPCP::ID = 0;
+  const char IPCP::ID = 0;
   RegisterPass X("ipconstprop", "Interprocedural constant propagation");
 }
 


Index: llvm/lib/Transforms/IPO/IndMemRemoval.cpp
diff -u llvm/lib/Transforms/IPO/IndMemRemoval.cpp:1.16 llvm/lib/Transforms/IPO/IndMemRemoval.cpp:1.17
--- llvm/lib/Transforms/IPO/IndMemRemoval.cpp:1.16	Tue May  1 16:15:46 2007
+++ llvm/lib/Transforms/IPO/IndMemRemoval.cpp	Wed May  2 16:39:19 2007
@@ -32,12 +32,12 @@
 namespace {
   class VISIBILITY_HIDDEN IndMemRemPass : public ModulePass {
   public:
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     IndMemRemPass() : ModulePass((intptr_t)&ID) {}
 
     virtual bool runOnModule(Module &M);
   };
-  const int IndMemRemPass::ID = 0;
+  const char IndMemRemPass::ID = 0;
   RegisterPass X("indmemrem","Indirect Malloc and Free Removal");
 } // end anonymous namespace
 


Index: llvm/lib/Transforms/IPO/InlineSimple.cpp
diff -u llvm/lib/Transforms/IPO/InlineSimple.cpp:1.79 llvm/lib/Transforms/IPO/InlineSimple.cpp:1.80
--- llvm/lib/Transforms/IPO/InlineSimple.cpp:1.79	Tue May  1 16:15:46 2007
+++ llvm/lib/Transforms/IPO/InlineSimple.cpp	Wed May  2 16:39:19 2007
@@ -54,10 +54,10 @@
   class VISIBILITY_HIDDEN SimpleInliner : public Inliner {
     std::map CachedFunctionInfo;
   public:
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     int getInlineCost(CallSite CS);
   };
-  const int SimpleInliner::ID = 0;
+  const char SimpleInliner::ID = 0;
   RegisterPass X("inline", "Function Integration/Inlining");
 }
 


Index: llvm/lib/Transforms/IPO/Inliner.cpp
diff -u llvm/lib/Transforms/IPO/Inliner.cpp:1.38 llvm/lib/Transforms/IPO/Inliner.cpp:1.39
--- llvm/lib/Transforms/IPO/Inliner.cpp:1.38	Tue May  1 16:15:46 2007
+++ llvm/lib/Transforms/IPO/Inliner.cpp	Wed May  2 16:39:19 2007
@@ -36,7 +36,7 @@
         cl::desc("Control the amount of inlining to perform (default = 200)"));
 }
 
-const int Inliner::ID = 0;
+const char Inliner::ID = 0;
 Inliner::Inliner() 
   : CallGraphSCCPass((intptr_t)&ID), InlineThreshold(InlineLimit) {}
 


Index: llvm/lib/Transforms/IPO/Inliner.h
diff -u llvm/lib/Transforms/IPO/Inliner.h:1.10 llvm/lib/Transforms/IPO/Inliner.h:1.11
--- llvm/lib/Transforms/IPO/Inliner.h:1.10	Tue May  1 16:15:46 2007
+++ llvm/lib/Transforms/IPO/Inliner.h	Wed May  2 16:39:19 2007
@@ -27,7 +27,7 @@
 /// perform the inlining operations that does not depend on the policy.
 ///
 struct Inliner : public CallGraphSCCPass {
-  static const int ID;
+  static const char ID;
   Inliner();
 
   /// getAnalysisUsage - For this class, we declare that we require and preserve


Index: llvm/lib/Transforms/IPO/Internalize.cpp
diff -u llvm/lib/Transforms/IPO/Internalize.cpp:1.46 llvm/lib/Transforms/IPO/Internalize.cpp:1.47
--- llvm/lib/Transforms/IPO/Internalize.cpp:1.46	Tue May  1 16:15:46 2007
+++ llvm/lib/Transforms/IPO/Internalize.cpp	Wed May  2 16:39:19 2007
@@ -46,13 +46,13 @@
     std::set ExternalNames;
     bool DontInternalize;
   public:
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     InternalizePass(bool InternalizeEverything = true);
     InternalizePass(const std::vector & exportList);
     void LoadFile(const char *Filename);
     virtual bool runOnModule(Module &M);
   };
-  const int InternalizePass::ID = 0;
+  const char InternalizePass::ID = 0;
   RegisterPass X("internalize", "Internalize Global Symbols");
 } // end anonymous namespace
 


Index: llvm/lib/Transforms/IPO/LoopExtractor.cpp
diff -u llvm/lib/Transforms/IPO/LoopExtractor.cpp:1.25 llvm/lib/Transforms/IPO/LoopExtractor.cpp:1.26
--- llvm/lib/Transforms/IPO/LoopExtractor.cpp:1.25	Tue May  1 16:15:46 2007
+++ llvm/lib/Transforms/IPO/LoopExtractor.cpp	Wed May  2 16:39:19 2007
@@ -34,7 +34,7 @@
   // Module passes to require FunctionPasses, so we can't get loop info if we're
   // not a function pass.
   struct VISIBILITY_HIDDEN LoopExtractor : public FunctionPass {
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     unsigned NumLoops;
 
     LoopExtractor(unsigned numLoops = ~0) 
@@ -51,17 +51,17 @@
     }
   };
 
-  const int LoopExtractor::ID = 0;
+  const char LoopExtractor::ID = 0;
   RegisterPass
   X("loop-extract", "Extract loops into new functions");
 
   /// SingleLoopExtractor - For bugpoint.
   struct SingleLoopExtractor : public LoopExtractor {
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     SingleLoopExtractor() : LoopExtractor(1) {}
   };
 
-  const int SingleLoopExtractor::ID = 0;
+  const char SingleLoopExtractor::ID = 0;
   RegisterPass
   Y("loop-extract-single", "Extract at most one loop into a new function");
 } // End anonymous namespace
@@ -152,7 +152,7 @@
   class BlockExtractorPass : public ModulePass {
     std::vector BlocksToNotExtract;
   public:
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     BlockExtractorPass(std::vector &B) 
       : ModulePass((intptr_t)&ID), BlocksToNotExtract(B) {}
     BlockExtractorPass() : ModulePass((intptr_t)&ID) {}
@@ -160,7 +160,7 @@
     bool runOnModule(Module &M);
   };
 
-  const int BlockExtractorPass::ID = 0;
+  const char BlockExtractorPass::ID = 0;
   RegisterPass
   XX("extract-blocks", "Extract Basic Blocks From Module (for bugpoint use)");
 }


Index: llvm/lib/Transforms/IPO/LowerSetJmp.cpp
diff -u llvm/lib/Transforms/IPO/LowerSetJmp.cpp:1.41 llvm/lib/Transforms/IPO/LowerSetJmp.cpp:1.42
--- llvm/lib/Transforms/IPO/LowerSetJmp.cpp:1.41	Tue May  1 16:15:46 2007
+++ llvm/lib/Transforms/IPO/LowerSetJmp.cpp	Wed May  2 16:39:19 2007
@@ -109,7 +109,7 @@
 
     bool IsTransformableFunction(const std::string& Name);
   public:
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     LowerSetJmp() : ModulePass((intptr_t)&ID) {}
 
     void visitCallInst(CallInst& CI);
@@ -121,7 +121,7 @@
     bool doInitialization(Module& M);
   };
 
-  const int LowerSetJmp::ID = 0;
+  const char LowerSetJmp::ID = 0;
   RegisterPass X("lowersetjmp", "Lower Set Jump");
 } // end anonymous namespace
 


Index: llvm/lib/Transforms/IPO/PruneEH.cpp
diff -u llvm/lib/Transforms/IPO/PruneEH.cpp:1.32 llvm/lib/Transforms/IPO/PruneEH.cpp:1.33
--- llvm/lib/Transforms/IPO/PruneEH.cpp:1.32	Tue May  1 16:15:46 2007
+++ llvm/lib/Transforms/IPO/PruneEH.cpp	Wed May  2 16:39:19 2007
@@ -35,7 +35,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN PruneEH : public CallGraphSCCPass {
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     PruneEH() : CallGraphSCCPass((intptr_t)&ID) {}
 
     /// DoesNotUnwind - This set contains all of the functions which we have
@@ -53,7 +53,7 @@
     void DeleteBasicBlock(BasicBlock *BB);
   };
 
-  const int PruneEH::ID = 0;
+  const char PruneEH::ID = 0;
   RegisterPass X("prune-eh", "Remove unused exception handling info");
 }
 


Index: llvm/lib/Transforms/IPO/RaiseAllocations.cpp
diff -u llvm/lib/Transforms/IPO/RaiseAllocations.cpp:1.41 llvm/lib/Transforms/IPO/RaiseAllocations.cpp:1.42
--- llvm/lib/Transforms/IPO/RaiseAllocations.cpp:1.41	Tue May  1 16:15:46 2007
+++ llvm/lib/Transforms/IPO/RaiseAllocations.cpp	Wed May  2 16:39:19 2007
@@ -35,7 +35,7 @@
     Function *MallocFunc;   // Functions in the module we are processing
     Function *FreeFunc;     // Initialized by doPassInitializationVirt
   public:
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     RaiseAllocations() 
       : ModulePass((intptr_t)&ID), MallocFunc(0), FreeFunc(0) {}
 
@@ -49,7 +49,7 @@
     bool runOnModule(Module &M);
   };
 
-  const int RaiseAllocations::ID = 0;
+  const char RaiseAllocations::ID = 0;
   RegisterPass
   X("raiseallocs", "Raise allocations from calls to instructions");
 }  // end anonymous namespace


Index: llvm/lib/Transforms/IPO/SimplifyLibCalls.cpp
diff -u llvm/lib/Transforms/IPO/SimplifyLibCalls.cpp:1.113 llvm/lib/Transforms/IPO/SimplifyLibCalls.cpp:1.114
--- llvm/lib/Transforms/IPO/SimplifyLibCalls.cpp:1.113	Tue May  1 16:15:46 2007
+++ llvm/lib/Transforms/IPO/SimplifyLibCalls.cpp	Wed May  2 16:39:19 2007
@@ -152,7 +152,7 @@
 /// @brief A ModulePass for optimizing well-known function calls.
 class VISIBILITY_HIDDEN SimplifyLibCalls : public ModulePass {
 public:
-  static const int ID; // Pass identifcation, replacement for typeid
+  static const char ID; // Pass identifcation, replacement for typeid
   SimplifyLibCalls() : ModulePass((intptr_t)&ID) {}
 
   /// We need some target data for accurate signature details that are
@@ -376,7 +376,7 @@
   TargetData *TD;        ///< Cached TargetData
 };
 
-const int SimplifyLibCalls::ID = 0;
+const char SimplifyLibCalls::ID = 0;
 // Register the pass
 RegisterPass
 X("simplify-libcalls", "Simplify well-known library calls");


Index: llvm/lib/Transforms/IPO/StripDeadPrototypes.cpp
diff -u llvm/lib/Transforms/IPO/StripDeadPrototypes.cpp:1.6 llvm/lib/Transforms/IPO/StripDeadPrototypes.cpp:1.7
--- llvm/lib/Transforms/IPO/StripDeadPrototypes.cpp:1.6	Tue May  1 16:15:46 2007
+++ llvm/lib/Transforms/IPO/StripDeadPrototypes.cpp	Wed May  2 16:39:19 2007
@@ -27,12 +27,12 @@
 /// @brief Pass to remove unused function declarations.
 class VISIBILITY_HIDDEN StripDeadPrototypesPass : public ModulePass {
 public:
-  static const int ID; // Pass identifcation, replacement for typeid
+  static const char ID; // Pass identifcation, replacement for typeid
   StripDeadPrototypesPass() : ModulePass((intptr_t)&ID) { }
   virtual bool runOnModule(Module &M);
 };
 
-const int StripDeadPrototypesPass::ID = 0;
+const char StripDeadPrototypesPass::ID = 0;
 RegisterPass X("strip-dead-prototypes", 
                                         "Strip Unused Function Prototypes");
 


Index: llvm/lib/Transforms/IPO/StripSymbols.cpp
diff -u llvm/lib/Transforms/IPO/StripSymbols.cpp:1.16 llvm/lib/Transforms/IPO/StripSymbols.cpp:1.17
--- llvm/lib/Transforms/IPO/StripSymbols.cpp:1.16	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/IPO/StripSymbols.cpp	Wed May  2 16:39:19 2007
@@ -37,7 +37,7 @@
   class VISIBILITY_HIDDEN StripSymbols : public ModulePass {
     bool OnlyDebugInfo;
   public:
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     StripSymbols(bool ODI = false) 
       : ModulePass((intptr_t)&ID), OnlyDebugInfo(ODI) {}
 
@@ -48,7 +48,7 @@
     }
   };
 
-  const int StripSymbols::ID = 0;
+  const char StripSymbols::ID = 0;
   RegisterPass X("strip", "Strip all symbols from a module");
 }
 





From dpatel at apple.com  Wed May  2 16:41:35 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 16:41:35 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Transforms/RSProfiling.h
Message-ID: <200705022141.l42LfZfj024462@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Transforms:

RSProfiling.h updated: 1.3 -> 1.4
---
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:  (+1 -1)

 RSProfiling.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/include/llvm/Transforms/RSProfiling.h
diff -u llvm/include/llvm/Transforms/RSProfiling.h:1.3 llvm/include/llvm/Transforms/RSProfiling.h:1.4
--- llvm/include/llvm/Transforms/RSProfiling.h:1.3	Tue May  1 16:15:46 2007
+++ llvm/include/llvm/Transforms/RSProfiling.h	Wed May  2 16:39:18 2007
@@ -23,7 +23,7 @@
   /// this interface are expected to chain to other implementations, such that
   /// multiple profilers can be support simultaniously.
   struct RSProfilers : public ModulePass {
-    static const int ID; // Pass identification, replacement for typeinfo
+    static const char ID; // Pass identification, replacement for typeinfo
     RSProfilers() : ModulePass((intptr_t)&ID) {}
 
     /// isProfiling - This method returns true if the value passed it was 





From dpatel at apple.com  Wed May  2 16:41:30 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 16:41:30 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Hello/Hello.cpp
Message-ID: <200705022141.l42LfULc024392@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Hello:

Hello.cpp updated: 1.15 -> 1.16
---
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:  (+4 -4)

 Hello.cpp |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Index: llvm/lib/Transforms/Hello/Hello.cpp
diff -u llvm/lib/Transforms/Hello/Hello.cpp:1.15 llvm/lib/Transforms/Hello/Hello.cpp:1.16
--- llvm/lib/Transforms/Hello/Hello.cpp:1.15	Tue May  1 16:15:46 2007
+++ llvm/lib/Transforms/Hello/Hello.cpp	Wed May  2 16:39:19 2007
@@ -25,7 +25,7 @@
 namespace {
   // Hello - The first implementation, without getAnalysisUsage.
   struct Hello : public FunctionPass {
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     Hello() : FunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnFunction(Function &F) {
@@ -37,12 +37,12 @@
     }
   };
 
-  const int Hello::ID = 0;
+  const char Hello::ID = 0;
   RegisterPass X("hello", "Hello World Pass");
 
   // Hello2 - The second implementation with getAnalysisUsage implemented.
   struct Hello2 : public FunctionPass {
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     Hello2() : FunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnFunction(Function &F) {
@@ -58,7 +58,7 @@
       AU.setPreservesAll();
     };
   };
-  const int Hello2::ID = 0;
+  const char Hello2::ID = 0;
   RegisterPass Y("hello2",
                         "Hello World Pass (with getAnalysisUsage implemented)");
 }





From dpatel at apple.com  Wed May  2 16:41:36 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 16:41:36 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/CBackend/CBackend.cpp
Message-ID: <200705022141.l42LfaVv024563@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/CBackend:

CBackend.cpp updated: 1.340 -> 1.341
---
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:  (+4 -4)

 CBackend.cpp |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Index: llvm/lib/Target/CBackend/CBackend.cpp
diff -u llvm/lib/Target/CBackend/CBackend.cpp:1.340 llvm/lib/Target/CBackend/CBackend.cpp:1.341
--- llvm/lib/Target/CBackend/CBackend.cpp:1.340	Tue May  1 21:17:41 2007
+++ llvm/lib/Target/CBackend/CBackend.cpp	Wed May  2 16:39:19 2007
@@ -57,7 +57,7 @@
   ///
   class CBackendNameAllUsedStructsAndMergeFunctions : public ModulePass {
   public:
-    static const int ID;
+    static const char ID;
     CBackendNameAllUsedStructsAndMergeFunctions() 
       : ModulePass((intptr_t)&ID) {}
     void getAnalysisUsage(AnalysisUsage &AU) const {
@@ -71,7 +71,7 @@
     virtual bool runOnModule(Module &M);
   };
 
-  const int CBackendNameAllUsedStructsAndMergeFunctions::ID = 0;
+  const char CBackendNameAllUsedStructsAndMergeFunctions::ID = 0;
 
   /// CWriter - This class is the main chunk of code that converts an LLVM
   /// module to a C translation unit.
@@ -88,7 +88,7 @@
     std::set intrinsicPrototypesAlreadyGenerated;
 
   public:
-    static const int ID;
+    static const char ID;
     CWriter(std::ostream &o) 
       : FunctionPass((intptr_t)&ID), Out(o), IL(0), Mang(0), LI(0), 
         TheModule(0), TAsm(0), TD(0) {}
@@ -264,7 +264,7 @@
   };
 }
 
-const int CWriter::ID = 0;
+const char CWriter::ID = 0;
 
 /// This method inserts names for any unnamed structure types that are used by
 /// the program, and removes names from structure types that are not used by the





From dpatel at apple.com  Wed May  2 16:41:32 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 16:41:32 -0500
Subject: [llvm-commits] CVS: llvm/lib/VMCore/AsmWriter.cpp Dominators.cpp
	PassManager.cpp Verifier.cpp
Message-ID: <200705022141.l42LfWa4024413@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

AsmWriter.cpp updated: 1.280 -> 1.281
Dominators.cpp updated: 1.98 -> 1.99
PassManager.cpp updated: 1.154 -> 1.155
Verifier.cpp updated: 1.210 -> 1.211
---
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:  (+16 -16)

 AsmWriter.cpp   |    4 ++--
 Dominators.cpp  |    6 +++---
 PassManager.cpp |   18 +++++++++---------
 Verifier.cpp    |    4 ++--
 4 files changed, 16 insertions(+), 16 deletions(-)


Index: llvm/lib/VMCore/AsmWriter.cpp
diff -u llvm/lib/VMCore/AsmWriter.cpp:1.280 llvm/lib/VMCore/AsmWriter.cpp:1.281
--- llvm/lib/VMCore/AsmWriter.cpp:1.280	Tue May  1 16:15:47 2007
+++ llvm/lib/VMCore/AsmWriter.cpp	Wed May  2 16:39:19 2007
@@ -135,10 +135,10 @@
 
 }  // end namespace llvm
 
-const int PrintModulePass::ID = 0;
+const char PrintModulePass::ID = 0;
 static RegisterPass
 X("printm", "Print module to stderr");
-const int PrintFunctionPass::ID = 0;
+const char PrintFunctionPass::ID = 0;
 static RegisterPass
 Y("print","Print function to stderr");
 


Index: llvm/lib/VMCore/Dominators.cpp
diff -u llvm/lib/VMCore/Dominators.cpp:1.98 llvm/lib/VMCore/Dominators.cpp:1.99
--- llvm/lib/VMCore/Dominators.cpp:1.98	Tue May  1 16:15:47 2007
+++ llvm/lib/VMCore/Dominators.cpp	Wed May  2 16:39:20 2007
@@ -58,7 +58,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-const int DominatorTree::ID = 0;
+const char DominatorTree::ID = 0;
 static RegisterPass
 E("domtree", "Dominator Tree Construction", true);
 
@@ -354,7 +354,7 @@
 //  DominanceFrontier Implementation
 //===----------------------------------------------------------------------===//
 
-const int DominanceFrontier::ID = 0;
+const char DominanceFrontier::ID = 0;
 static RegisterPass
 G("domfrontier", "Dominance Frontier Construction", true);
 
@@ -835,7 +835,7 @@
 // ETForest implementation
 //===----------------------------------------------------------------------===//
 
-const int ETForest::ID = 0;
+const char ETForest::ID = 0;
 static RegisterPass
 D("etforest", "ET Forest Construction", true);
 


Index: llvm/lib/VMCore/PassManager.cpp
diff -u llvm/lib/VMCore/PassManager.cpp:1.154 llvm/lib/VMCore/PassManager.cpp:1.155
--- llvm/lib/VMCore/PassManager.cpp:1.154	Tue May  1 16:15:47 2007
+++ llvm/lib/VMCore/PassManager.cpp	Wed May  2 16:39:20 2007
@@ -63,7 +63,7 @@
                                         public FunctionPass {
 
 public:
-  static const int ID;
+  static const char ID;
   BBPassManager(int Depth) 
     : PMDataManager(Depth), FunctionPass((intptr_t)&ID) {}
 
@@ -106,7 +106,7 @@
   }
 };
 
-const int BBPassManager::ID = 0;
+const char BBPassManager::ID = 0;
 }
 
 namespace llvm {
@@ -119,7 +119,7 @@
                                 public PMDataManager,
                                 public PMTopLevelManager {
 public:
-  static const int ID;
+  static const char ID;
   FunctionPassManagerImpl(int Depth) : 
     Pass((intptr_t)&ID), PMDataManager(Depth), 
     PMTopLevelManager(TLM_Function) { }
@@ -173,7 +173,7 @@
   }
 };
 
-const int FunctionPassManagerImpl::ID = 0;
+const char FunctionPassManagerImpl::ID = 0;
 //===----------------------------------------------------------------------===//
 // MPPassManager
 //
@@ -183,7 +183,7 @@
 class MPPassManager : public Pass, public PMDataManager {
  
 public:
-  static const int ID;
+  static const char ID;
   MPPassManager(int Depth) : Pass((intptr_t)&ID), PMDataManager(Depth) { }
 
   // Delete on the fly managers.
@@ -247,7 +247,7 @@
   std::map OnTheFlyManagers;
 };
 
-const int MPPassManager::ID = 0;
+const char MPPassManager::ID = 0;
 //===----------------------------------------------------------------------===//
 // PassManagerImpl
 //
@@ -258,7 +258,7 @@
                         public PMTopLevelManager {
 
 public:
-  static const int ID;
+  static const char ID;
   PassManagerImpl(int Depth) : Pass((intptr_t)&ID), PMDataManager(Depth),
                                PMTopLevelManager(TLM_Pass) { }
 
@@ -304,7 +304,7 @@
 
 };
 
-const int PassManagerImpl::ID = 0;
+const char PassManagerImpl::ID = 0;
 } // End of llvm namespace
 
 namespace {
@@ -1108,7 +1108,7 @@
 //===----------------------------------------------------------------------===//
 // FPPassManager implementation
 
-const int FPPassManager::ID = 0;
+const char FPPassManager::ID = 0;
 /// Print passes managed by this manager
 void FPPassManager::dumpPassStructure(unsigned Offset) {
   llvm::cerr << std::string(Offset*2, ' ') << "FunctionPass Manager\n";


Index: llvm/lib/VMCore/Verifier.cpp
diff -u llvm/lib/VMCore/Verifier.cpp:1.210 llvm/lib/VMCore/Verifier.cpp:1.211
--- llvm/lib/VMCore/Verifier.cpp:1.210	Tue May  1 16:15:47 2007
+++ llvm/lib/VMCore/Verifier.cpp	Wed May  2 16:39:20 2007
@@ -69,7 +69,7 @@
 
   struct VISIBILITY_HIDDEN
      Verifier : public FunctionPass, InstVisitor {
-    static const int ID; // Pass ID, replacement for typeid
+    static const char ID; // Pass ID, replacement for typeid
     bool Broken;          // Is this module found to be broken?
     bool RealPass;        // Are we not being run by a PassManager?
     VerifierFailureAction action;
@@ -266,7 +266,7 @@
     }
   };
 
-  const int Verifier::ID = 0;
+  const char Verifier::ID = 0;
   RegisterPass X("verify", "Module Verifier");
 } // End anonymous namespace
 





From dpatel at apple.com  Wed May  2 16:41:37 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 16:41:37 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/IA64/IA64Bundling.cpp
Message-ID: <200705022141.l42LfbRX024611@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/IA64:

IA64Bundling.cpp updated: 1.9 -> 1.10
---
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:  (+2 -2)

 IA64Bundling.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm/lib/Target/IA64/IA64Bundling.cpp
diff -u llvm/lib/Target/IA64/IA64Bundling.cpp:1.9 llvm/lib/Target/IA64/IA64Bundling.cpp:1.10
--- llvm/lib/Target/IA64/IA64Bundling.cpp:1.9	Tue May  1 16:15:46 2007
+++ llvm/lib/Target/IA64/IA64Bundling.cpp	Wed May  2 16:39:19 2007
@@ -36,7 +36,7 @@
 
 namespace {
   struct IA64BundlingPass : public MachineFunctionPass {
-    static const int ID;
+    static const char ID;
     /// Target machine description which we query for reg. names, data
     /// layout, etc.
     ///
@@ -63,7 +63,7 @@
     // 'fallthrough' code
     std::set PendingRegWrites;
   };
-  const int IA64BundlingPass::ID = 0;
+  const char IA64BundlingPass::ID = 0;
 } // end of anonymous namespace
 
 /// createIA64BundlingPass - Returns a pass that adds STOP (;;) instructions





From dpatel at apple.com  Wed May  2 16:41:38 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 16:41:38 -0500
Subject: [llvm-commits] CVS:
	llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h
Message-ID: <200705022141.l42LfcDQ024624@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Transforms/Utils:

UnifyFunctionExitNodes.h updated: 1.21 -> 1.22
---
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:  (+1 -1)

 UnifyFunctionExitNodes.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h
diff -u llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h:1.21 llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h:1.22
--- llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h:1.21	Tue May  1 16:15:46 2007
+++ llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h	Wed May  2 16:39:18 2007
@@ -25,7 +25,7 @@
 struct UnifyFunctionExitNodes : public FunctionPass {
   BasicBlock *ReturnBlock, *UnwindBlock, *UnreachableBlock;
 public:
-  static const int ID; // Pass identifcation, replacement for typeid
+  static const char ID; // Pass identifcation, replacement for typeid
   UnifyFunctionExitNodes() : FunctionPass((intptr_t)&ID),
                              ReturnBlock(0), UnwindBlock(0) {}
 





From dpatel at apple.com  Wed May  2 16:41:36 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 16:41:36 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp LCSSA.cpp
	LoopSimplify.cpp LowerAllocations.cpp LowerInvoke.cpp
	LowerSelect.cpp LowerSwitch.cpp Mem2Reg.cpp
	UnifyFunctionExitNodes.cpp
Message-ID: <200705022141.l42LfaMD024560@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Utils:

BreakCriticalEdges.cpp updated: 1.45 -> 1.46
LCSSA.cpp updated: 1.39 -> 1.40
LoopSimplify.cpp updated: 1.93 -> 1.94
LowerAllocations.cpp updated: 1.74 -> 1.75
LowerInvoke.cpp updated: 1.60 -> 1.61
LowerSelect.cpp updated: 1.13 -> 1.14
LowerSwitch.cpp updated: 1.39 -> 1.40
Mem2Reg.cpp updated: 1.27 -> 1.28
UnifyFunctionExitNodes.cpp updated: 1.37 -> 1.38
---
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:  (+17 -17)

 BreakCriticalEdges.cpp     |    4 ++--
 LCSSA.cpp                  |    4 ++--
 LoopSimplify.cpp           |    4 ++--
 LowerAllocations.cpp       |    4 ++--
 LowerInvoke.cpp            |    4 ++--
 LowerSelect.cpp            |    4 ++--
 LowerSwitch.cpp            |    4 ++--
 Mem2Reg.cpp                |    4 ++--
 UnifyFunctionExitNodes.cpp |    2 +-
 9 files changed, 17 insertions(+), 17 deletions(-)


Index: llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp
diff -u llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp:1.45 llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp:1.46
--- llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp:1.45	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp	Wed May  2 16:39:19 2007
@@ -34,7 +34,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN BreakCriticalEdges : public FunctionPass {
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     BreakCriticalEdges() : FunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnFunction(Function &F);
@@ -50,7 +50,7 @@
     }
   };
 
-  const int BreakCriticalEdges::ID = 0;
+  const char BreakCriticalEdges::ID = 0;
   RegisterPass X("break-crit-edges",
                                     "Break critical edges in CFG");
 }


Index: llvm/lib/Transforms/Utils/LCSSA.cpp
diff -u llvm/lib/Transforms/Utils/LCSSA.cpp:1.39 llvm/lib/Transforms/Utils/LCSSA.cpp:1.40
--- llvm/lib/Transforms/Utils/LCSSA.cpp:1.39	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Utils/LCSSA.cpp	Wed May  2 16:39:19 2007
@@ -47,7 +47,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN LCSSA : public FunctionPass {
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     LCSSA() : FunctionPass((intptr_t)&ID) {}
 
     // Cached analysis information for the current function.
@@ -84,7 +84,7 @@
     }
   };
   
-  const int LCSSA::ID = 0;
+  const char LCSSA::ID = 0;
   RegisterPass X("lcssa", "Loop-Closed SSA Form Pass");
 }
 


Index: llvm/lib/Transforms/Utils/LoopSimplify.cpp
diff -u llvm/lib/Transforms/Utils/LoopSimplify.cpp:1.93 llvm/lib/Transforms/Utils/LoopSimplify.cpp:1.94
--- llvm/lib/Transforms/Utils/LoopSimplify.cpp:1.93	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Utils/LoopSimplify.cpp	Wed May  2 16:39:19 2007
@@ -54,7 +54,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN LoopSimplify : public FunctionPass {
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     LoopSimplify() : FunctionPass((intptr_t)&ID) {}
 
     // AA - If we have an alias analysis object to update, this is it, otherwise
@@ -92,7 +92,7 @@
                                          std::vector &PredBlocks);
   };
 
-  const int LoopSimplify::ID = 0;
+  const char LoopSimplify::ID = 0;
   RegisterPass
   X("loopsimplify", "Canonicalize natural loops", true);
 }


Index: llvm/lib/Transforms/Utils/LowerAllocations.cpp
diff -u llvm/lib/Transforms/Utils/LowerAllocations.cpp:1.74 llvm/lib/Transforms/Utils/LowerAllocations.cpp:1.75
--- llvm/lib/Transforms/Utils/LowerAllocations.cpp:1.74	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Utils/LowerAllocations.cpp	Wed May  2 16:39:19 2007
@@ -36,7 +36,7 @@
     Constant *FreeFunc;     // Initialized by doInitialization
     bool LowerMallocArgToInteger;
   public:
-    static const int ID; // Pass ID, replacement for typeid
+    static const char ID; // Pass ID, replacement for typeid
     LowerAllocations(bool LowerToInt = false)
       : BasicBlockPass((intptr_t)&ID), MallocFunc(0), FreeFunc(0), 
         LowerMallocArgToInteger(LowerToInt) {}
@@ -68,7 +68,7 @@
     bool runOnBasicBlock(BasicBlock &BB);
   };
 
-  const int LowerAllocations::ID = 0;
+  const char LowerAllocations::ID = 0;
   RegisterPass
   X("lowerallocs", "Lower allocations from instructions to calls");
 }


Index: llvm/lib/Transforms/Utils/LowerInvoke.cpp
diff -u llvm/lib/Transforms/Utils/LowerInvoke.cpp:1.60 llvm/lib/Transforms/Utils/LowerInvoke.cpp:1.61
--- llvm/lib/Transforms/Utils/LowerInvoke.cpp:1.60	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Utils/LowerInvoke.cpp	Wed May  2 16:39:19 2007
@@ -75,7 +75,7 @@
     const TargetLowering *TLI;
     
   public:
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     LowerInvoke(const TargetLowering *tli = NULL) : FunctionPass((intptr_t)&ID),
       TLI(tli) { }
     bool doInitialization(Module &M);
@@ -99,7 +99,7 @@
     bool insertExpensiveEHSupport(Function &F);
   };
 
-  const int LowerInvoke::ID = 0;
+  const char LowerInvoke::ID = 0;
   RegisterPass
   X("lowerinvoke", "Lower invoke and unwind, for unwindless code generators");
 }


Index: llvm/lib/Transforms/Utils/LowerSelect.cpp
diff -u llvm/lib/Transforms/Utils/LowerSelect.cpp:1.13 llvm/lib/Transforms/Utils/LowerSelect.cpp:1.14
--- llvm/lib/Transforms/Utils/LowerSelect.cpp:1.13	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Utils/LowerSelect.cpp	Wed May  2 16:39:19 2007
@@ -33,7 +33,7 @@
   class VISIBILITY_HIDDEN LowerSelect : public FunctionPass {
     bool OnlyFP;   // Only lower FP select instructions?
   public:
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     LowerSelect(bool onlyfp = false) : FunctionPass((intptr_t)&ID), 
       OnlyFP(onlyfp) {}
 
@@ -50,7 +50,7 @@
     bool runOnFunction(Function &F);
   };
 
-  const int LowerSelect::ID = 0;
+  const char LowerSelect::ID = 0;
   RegisterPass
   X("lowerselect", "Lower select instructions to branches");
 }


Index: llvm/lib/Transforms/Utils/LowerSwitch.cpp
diff -u llvm/lib/Transforms/Utils/LowerSwitch.cpp:1.39 llvm/lib/Transforms/Utils/LowerSwitch.cpp:1.40
--- llvm/lib/Transforms/Utils/LowerSwitch.cpp:1.39	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Utils/LowerSwitch.cpp	Wed May  2 16:39:19 2007
@@ -30,7 +30,7 @@
   /// modifies the CFG!
   class VISIBILITY_HIDDEN LowerSwitch : public FunctionPass {
   public:
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     LowerSwitch() : FunctionPass((intptr_t) &ID) {} 
 
     virtual bool runOnFunction(Function &F);
@@ -78,7 +78,7 @@
     }
   };
 
-  const int LowerSwitch::ID = 0;
+  const char LowerSwitch::ID = 0;
   RegisterPass
   X("lowerswitch", "Lower SwitchInst's to branches");
 }


Index: llvm/lib/Transforms/Utils/Mem2Reg.cpp
diff -u llvm/lib/Transforms/Utils/Mem2Reg.cpp:1.27 llvm/lib/Transforms/Utils/Mem2Reg.cpp:1.28
--- llvm/lib/Transforms/Utils/Mem2Reg.cpp:1.27	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Utils/Mem2Reg.cpp	Wed May  2 16:39:19 2007
@@ -27,7 +27,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN PromotePass : public FunctionPass {
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     PromotePass() : FunctionPass((intptr_t)&ID) {}
 
     // runOnFunction - To run this pass, first we calculate the alloca
@@ -50,7 +50,7 @@
     }
   };
 
-  const int PromotePass::ID = 0;
+  const char PromotePass::ID = 0;
   RegisterPass X("mem2reg", "Promote Memory to Register");
 }  // end of anonymous namespace
 


Index: llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp
diff -u llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp:1.37 llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp:1.38
--- llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp:1.37	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp	Wed May  2 16:39:19 2007
@@ -22,7 +22,7 @@
 #include "llvm/Type.h"
 using namespace llvm;
 
-const int UnifyFunctionExitNodes::ID = 0;
+const char UnifyFunctionExitNodes::ID = 0;
 static RegisterPass
 X("mergereturn", "Unify function exit nodes");
 





From dpatel at apple.com  Wed May  2 16:41:35 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 16:41:35 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/Alpha/AlphaBranchSelector.cpp
	AlphaCodeEmitter.cpp AlphaLLRP.cpp
Message-ID: <200705022141.l42LfZub024500@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/Alpha:

AlphaBranchSelector.cpp updated: 1.3 -> 1.4
AlphaCodeEmitter.cpp updated: 1.22 -> 1.23
AlphaLLRP.cpp updated: 1.9 -> 1.10
---
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:  (+6 -6)

 AlphaBranchSelector.cpp |    4 ++--
 AlphaCodeEmitter.cpp    |    4 ++--
 AlphaLLRP.cpp           |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)


Index: llvm/lib/Target/Alpha/AlphaBranchSelector.cpp
diff -u llvm/lib/Target/Alpha/AlphaBranchSelector.cpp:1.3 llvm/lib/Target/Alpha/AlphaBranchSelector.cpp:1.4
--- llvm/lib/Target/Alpha/AlphaBranchSelector.cpp:1.3	Tue May  1 16:15:46 2007
+++ llvm/lib/Target/Alpha/AlphaBranchSelector.cpp	Wed May  2 16:39:19 2007
@@ -22,7 +22,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN AlphaBSel : public MachineFunctionPass {
-    static const int ID;
+    static const char ID;
     AlphaBSel() : MachineFunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnMachineFunction(MachineFunction &Fn);
@@ -31,7 +31,7 @@
       return "Alpha Branch Selection";
     }
   };
-  const int AlphaBSel::ID = 0;
+  const char AlphaBSel::ID = 0;
 }
 
 /// createAlphaBranchSelectionPass - returns an instance of the Branch Selection


Index: llvm/lib/Target/Alpha/AlphaCodeEmitter.cpp
diff -u llvm/lib/Target/Alpha/AlphaCodeEmitter.cpp:1.22 llvm/lib/Target/Alpha/AlphaCodeEmitter.cpp:1.23
--- llvm/lib/Target/Alpha/AlphaCodeEmitter.cpp:1.22	Tue May  1 16:15:46 2007
+++ llvm/lib/Target/Alpha/AlphaCodeEmitter.cpp	Wed May  2 16:39:19 2007
@@ -36,7 +36,7 @@
     int getMachineOpValue(MachineInstr &MI, MachineOperand &MO);
 
   public:
-    static const int ID;
+    static const char ID;
     explicit AlphaCodeEmitter(TargetMachine &tm, MachineCodeEmitter &mce)
       : MachineFunctionPass((intptr_t)&ID), II(0), TM(tm), MCE(mce) {}
     AlphaCodeEmitter(TargetMachine &tm, MachineCodeEmitter &mce,
@@ -61,7 +61,7 @@
     void emitBasicBlock(MachineBasicBlock &MBB);
 
   };
-  const int AlphaCodeEmitter::ID = 0;
+  const char AlphaCodeEmitter::ID = 0;
 }
 
 /// createAlphaCodeEmitterPass - Return a pass that emits the collected Alpha code


Index: llvm/lib/Target/Alpha/AlphaLLRP.cpp
diff -u llvm/lib/Target/Alpha/AlphaLLRP.cpp:1.9 llvm/lib/Target/Alpha/AlphaLLRP.cpp:1.10
--- llvm/lib/Target/Alpha/AlphaLLRP.cpp:1.9	Tue May  1 16:15:46 2007
+++ llvm/lib/Target/Alpha/AlphaLLRP.cpp	Wed May  2 16:39:19 2007
@@ -37,7 +37,7 @@
     ///
     AlphaTargetMachine &TM;
 
-    static const int ID;
+    static const char ID;
     AlphaLLRPPass(AlphaTargetMachine &tm) 
       : MachineFunctionPass((intptr_t)&ID), TM(tm) { }
 
@@ -154,7 +154,7 @@
       return Changed;
     }
   };
-  const int AlphaLLRPPass::ID = 0;
+  const char AlphaLLRPPass::ID = 0;
 } // end of anonymous namespace
 
 FunctionPass *llvm::createAlphaLLRPPass(AlphaTargetMachine &tm) {





From dpatel at apple.com  Wed May  2 16:41:37 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 16:41:37 -0500
Subject: [llvm-commits] CVS: llvm/lib/Analysis/AliasAnalysis.cpp
	AliasAnalysisCounter.cpp AliasAnalysisEvaluator.cpp
	AliasDebugger.cpp AliasSetTracker.cpp BasicAliasAnalysis.cpp
	CFGPrinter.cpp InstCount.cpp IntervalPartition.cpp
	LoadValueNumbering.cpp LoopInfo.cpp LoopPass.cpp
	PostDominators.cpp ProfileInfo.cpp ProfileInfoLoaderPass.cpp
	ScalarEvolution.cpp ValueNumbering.cpp
Message-ID: <200705022141.l42Lfbja024606@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Analysis:

AliasAnalysis.cpp updated: 1.32 -> 1.33
AliasAnalysisCounter.cpp updated: 1.21 -> 1.22
AliasAnalysisEvaluator.cpp updated: 1.34 -> 1.35
AliasDebugger.cpp updated: 1.4 -> 1.5
AliasSetTracker.cpp updated: 1.47 -> 1.48
BasicAliasAnalysis.cpp updated: 1.109 -> 1.110
CFGPrinter.cpp updated: 1.23 -> 1.24
InstCount.cpp updated: 1.21 -> 1.22
IntervalPartition.cpp updated: 1.33 -> 1.34
LoadValueNumbering.cpp updated: 1.40 -> 1.41
LoopInfo.cpp updated: 1.84 -> 1.85
LoopPass.cpp updated: 1.19 -> 1.20
PostDominators.cpp updated: 1.68 -> 1.69
ProfileInfo.cpp updated: 1.13 -> 1.14
ProfileInfoLoaderPass.cpp updated: 1.19 -> 1.20
ScalarEvolution.cpp updated: 1.114 -> 1.115
ValueNumbering.cpp updated: 1.26 -> 1.27
---
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:  (+36 -36)

 AliasAnalysis.cpp          |    2 +-
 AliasAnalysisCounter.cpp   |    4 ++--
 AliasAnalysisEvaluator.cpp |    4 ++--
 AliasDebugger.cpp          |    4 ++--
 AliasSetTracker.cpp        |    4 ++--
 BasicAliasAnalysis.cpp     |    8 ++++----
 CFGPrinter.cpp             |    8 ++++----
 InstCount.cpp              |    4 ++--
 IntervalPartition.cpp      |    2 +-
 LoadValueNumbering.cpp     |    4 ++--
 LoopInfo.cpp               |    2 +-
 LoopPass.cpp               |    2 +-
 PostDominators.cpp         |    6 +++---
 ProfileInfo.cpp            |    6 +++---
 ProfileInfoLoaderPass.cpp  |    4 ++--
 ScalarEvolution.cpp        |    2 +-
 ValueNumbering.cpp         |    6 +++---
 17 files changed, 36 insertions(+), 36 deletions(-)


Index: llvm/lib/Analysis/AliasAnalysis.cpp
diff -u llvm/lib/Analysis/AliasAnalysis.cpp:1.32 llvm/lib/Analysis/AliasAnalysis.cpp:1.33
--- llvm/lib/Analysis/AliasAnalysis.cpp:1.32	Wed May  2 15:37:47 2007
+++ llvm/lib/Analysis/AliasAnalysis.cpp	Wed May  2 16:39:18 2007
@@ -36,7 +36,7 @@
 namespace {
   RegisterAnalysisGroup Z("Alias Analysis");
 }
-const int AliasAnalysis::ID = 0;
+const char AliasAnalysis::ID = 0;
 
 //===----------------------------------------------------------------------===//
 // Default chaining methods


Index: llvm/lib/Analysis/AliasAnalysisCounter.cpp
diff -u llvm/lib/Analysis/AliasAnalysisCounter.cpp:1.21 llvm/lib/Analysis/AliasAnalysisCounter.cpp:1.22
--- llvm/lib/Analysis/AliasAnalysisCounter.cpp:1.21	Tue May  1 16:15:46 2007
+++ llvm/lib/Analysis/AliasAnalysisCounter.cpp	Wed May  2 16:39:18 2007
@@ -34,7 +34,7 @@
     const char *Name;
     Module *M;
   public:
-    static const int ID; // Class identification, replacement for typeinfo
+    static const char ID; // Class identification, replacement for typeinfo
     AliasAnalysisCounter() : ModulePass((intptr_t) &ID) {
       No = May = Must = 0;
       NoMR = JustRef = JustMod = MR = 0;
@@ -108,7 +108,7 @@
     }
   };
 
-  const int AliasAnalysisCounter::ID = 0;
+  const char AliasAnalysisCounter::ID = 0;
   RegisterPass
   X("count-aa", "Count Alias Analysis Query Responses");
   RegisterAnalysisGroup Y(X);


Index: llvm/lib/Analysis/AliasAnalysisEvaluator.cpp
diff -u llvm/lib/Analysis/AliasAnalysisEvaluator.cpp:1.34 llvm/lib/Analysis/AliasAnalysisEvaluator.cpp:1.35
--- llvm/lib/Analysis/AliasAnalysisEvaluator.cpp:1.34	Tue May  1 16:15:46 2007
+++ llvm/lib/Analysis/AliasAnalysisEvaluator.cpp	Wed May  2 16:39:18 2007
@@ -50,7 +50,7 @@
     unsigned NoModRef, Mod, Ref, ModRef;
 
   public:
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     AAEval() : FunctionPass((intptr_t)&ID) {}
 
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
@@ -73,7 +73,7 @@
     bool doFinalization(Module &M);
   };
 
-  const int AAEval::ID = 0;
+  const char AAEval::ID = 0;
   RegisterPass
   X("aa-eval", "Exhaustive Alias Analysis Precision Evaluator");
 }


Index: llvm/lib/Analysis/AliasDebugger.cpp
diff -u llvm/lib/Analysis/AliasDebugger.cpp:1.4 llvm/lib/Analysis/AliasDebugger.cpp:1.5
--- llvm/lib/Analysis/AliasDebugger.cpp:1.4	Tue May  1 16:15:46 2007
+++ llvm/lib/Analysis/AliasDebugger.cpp	Wed May  2 16:39:18 2007
@@ -40,7 +40,7 @@
     std::set Vals;
     
   public:
-    static const int ID; // Class identification, replacement for typeinfo
+    static const char ID; // Class identification, replacement for typeinfo
     AliasDebugger() : ModulePass((intptr_t)&ID) {}
 
     bool runOnModule(Module &M) {
@@ -122,7 +122,7 @@
 
   };
 
-  const int AliasDebugger::ID = 0;
+  const char AliasDebugger::ID = 0;
   RegisterPass X("debug-aa", "AA use debugger");
   RegisterAnalysisGroup Y(X);
 }


Index: llvm/lib/Analysis/AliasSetTracker.cpp
diff -u llvm/lib/Analysis/AliasSetTracker.cpp:1.47 llvm/lib/Analysis/AliasSetTracker.cpp:1.48
--- llvm/lib/Analysis/AliasSetTracker.cpp:1.47	Tue May  1 16:15:46 2007
+++ llvm/lib/Analysis/AliasSetTracker.cpp	Wed May  2 16:39:18 2007
@@ -555,7 +555,7 @@
   class VISIBILITY_HIDDEN AliasSetPrinter : public FunctionPass {
     AliasSetTracker *Tracker;
   public:
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     AliasSetPrinter() : FunctionPass((intptr_t)&ID) {}
 
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
@@ -573,6 +573,6 @@
       return false;
     }
   };
-  const int AliasSetPrinter::ID = 0;
+  const char AliasSetPrinter::ID = 0;
   RegisterPass X("print-alias-sets", "Alias Set Printer");
 }


Index: llvm/lib/Analysis/BasicAliasAnalysis.cpp
diff -u llvm/lib/Analysis/BasicAliasAnalysis.cpp:1.109 llvm/lib/Analysis/BasicAliasAnalysis.cpp:1.110
--- llvm/lib/Analysis/BasicAliasAnalysis.cpp:1.109	Tue May  1 16:15:46 2007
+++ llvm/lib/Analysis/BasicAliasAnalysis.cpp	Wed May  2 16:39:18 2007
@@ -36,7 +36,7 @@
   /// such it doesn't follow many of the rules that other alias analyses must.
   ///
   struct VISIBILITY_HIDDEN NoAA : public ImmutablePass, public AliasAnalysis {
-    static const int ID; // Class identification, replacement for typeinfo
+    static const char ID; // Class identification, replacement for typeinfo
     NoAA() : ImmutablePass((intptr_t)&ID) {}
 
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
@@ -77,7 +77,7 @@
   };
 
   // Register this pass...
-  const int NoAA::ID = 0;
+  const char NoAA::ID = 0;
   RegisterPass
   U("no-aa", "No Alias Analysis (always returns 'may' alias)");
 
@@ -92,7 +92,7 @@
   /// Because it doesn't chain to a previous alias analysis (like -no-aa), it
   /// derives from the NoAA class.
   struct VISIBILITY_HIDDEN BasicAliasAnalysis : public NoAA {
-    static const int ID; // Class identification, replacement for typeinfo
+    static const char ID; // Class identification, replacement for typeinfo
     AliasResult alias(const Value *V1, unsigned V1Size,
                       const Value *V2, unsigned V2Size);
 
@@ -124,7 +124,7 @@
   };
 
   // Register this pass...
-  const int BasicAliasAnalysis::ID = 0;
+  const char BasicAliasAnalysis::ID = 0;
   RegisterPass
   X("basicaa", "Basic Alias Analysis (default AA impl)");
 


Index: llvm/lib/Analysis/CFGPrinter.cpp
diff -u llvm/lib/Analysis/CFGPrinter.cpp:1.23 llvm/lib/Analysis/CFGPrinter.cpp:1.24
--- llvm/lib/Analysis/CFGPrinter.cpp:1.23	Tue May  1 16:15:46 2007
+++ llvm/lib/Analysis/CFGPrinter.cpp	Wed May  2 16:39:18 2007
@@ -91,7 +91,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN CFGPrinter : public FunctionPass {
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     CFGPrinter() : FunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnFunction(Function &F) {
@@ -114,12 +114,12 @@
     }
   };
 
-  const int CFGPrinter::ID = 0;
+  const char CFGPrinter::ID = 0;
   RegisterPass P1("print-cfg",
                               "Print CFG of function to 'dot' file");
 
   struct VISIBILITY_HIDDEN CFGOnlyPrinter : public CFGPrinter {
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     virtual bool runOnFunction(Function &F) {
       bool OldCFGOnly = CFGOnly;
       CFGOnly = true;
@@ -134,7 +134,7 @@
     }
   };
 
-  const int CFGOnlyPrinter::ID = 0;
+  const char CFGOnlyPrinter::ID = 0;
   RegisterPass
   P2("print-cfg-only",
      "Print CFG of function to 'dot' file (with no function bodies)");


Index: llvm/lib/Analysis/InstCount.cpp
diff -u llvm/lib/Analysis/InstCount.cpp:1.21 llvm/lib/Analysis/InstCount.cpp:1.22
--- llvm/lib/Analysis/InstCount.cpp:1.21	Tue May  1 16:15:46 2007
+++ llvm/lib/Analysis/InstCount.cpp	Wed May  2 16:39:18 2007
@@ -51,7 +51,7 @@
       abort();
     }
   public:
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     InstCount() : FunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnFunction(Function &F);
@@ -63,7 +63,7 @@
 
   };
 
-  const int InstCount::ID = 0;
+  const char InstCount::ID = 0;
   RegisterPass X("instcount",
                             "Counts the various types of Instructions");
 }


Index: llvm/lib/Analysis/IntervalPartition.cpp
diff -u llvm/lib/Analysis/IntervalPartition.cpp:1.33 llvm/lib/Analysis/IntervalPartition.cpp:1.34
--- llvm/lib/Analysis/IntervalPartition.cpp:1.33	Tue May  1 16:15:46 2007
+++ llvm/lib/Analysis/IntervalPartition.cpp	Wed May  2 16:39:18 2007
@@ -15,7 +15,7 @@
 #include "llvm/Analysis/IntervalIterator.h"
 using namespace llvm;
 
-const int IntervalPartition::ID = 0;
+const char IntervalPartition::ID = 0;
 static RegisterPass
 X("intervals", "Interval Partition Construction", true);
 


Index: llvm/lib/Analysis/LoadValueNumbering.cpp
diff -u llvm/lib/Analysis/LoadValueNumbering.cpp:1.40 llvm/lib/Analysis/LoadValueNumbering.cpp:1.41
--- llvm/lib/Analysis/LoadValueNumbering.cpp:1.40	Tue May  1 16:15:46 2007
+++ llvm/lib/Analysis/LoadValueNumbering.cpp	Wed May  2 16:39:18 2007
@@ -40,7 +40,7 @@
 namespace {
   // FIXME: This should not be a FunctionPass.
   struct VISIBILITY_HIDDEN LoadVN : public FunctionPass, public ValueNumbering {
-    static const int ID; // Class identification, replacement for typeinfo
+    static const char ID; // Class identification, replacement for typeinfo
     LoadVN() : FunctionPass((intptr_t)&ID) {}
 
     /// Pass Implementation stuff.  This doesn't do any analysis.
@@ -83,7 +83,7 @@
                                  std::vector &RetVals) const;
   };
 
-  const int LoadVN::ID = 0;
+  const char LoadVN::ID = 0;
   // Register this pass...
   RegisterPass X("load-vn", "Load Value Numbering");
 


Index: llvm/lib/Analysis/LoopInfo.cpp
diff -u llvm/lib/Analysis/LoopInfo.cpp:1.84 llvm/lib/Analysis/LoopInfo.cpp:1.85
--- llvm/lib/Analysis/LoopInfo.cpp:1.84	Tue May  1 16:15:46 2007
+++ llvm/lib/Analysis/LoopInfo.cpp	Wed May  2 16:39:18 2007
@@ -27,7 +27,7 @@
 #include 
 using namespace llvm;
 
-const int LoopInfo::ID = 0;
+const char LoopInfo::ID = 0;
 static RegisterPass
 X("loops", "Natural Loop Construction", true);
 


Index: llvm/lib/Analysis/LoopPass.cpp
diff -u llvm/lib/Analysis/LoopPass.cpp:1.19 llvm/lib/Analysis/LoopPass.cpp:1.20
--- llvm/lib/Analysis/LoopPass.cpp:1.19	Tue May  1 16:15:46 2007
+++ llvm/lib/Analysis/LoopPass.cpp	Wed May  2 16:39:18 2007
@@ -21,7 +21,7 @@
 // LPPassManager
 //
 
-const int LPPassManager::ID = 0;
+const char LPPassManager::ID = 0;
 /// LPPassManager manages FPPassManagers and CalLGraphSCCPasses.
 
 LPPassManager::LPPassManager(int Depth) 


Index: llvm/lib/Analysis/PostDominators.cpp
diff -u llvm/lib/Analysis/PostDominators.cpp:1.68 llvm/lib/Analysis/PostDominators.cpp:1.69
--- llvm/lib/Analysis/PostDominators.cpp:1.68	Tue May  1 16:15:46 2007
+++ llvm/lib/Analysis/PostDominators.cpp	Wed May  2 16:39:18 2007
@@ -22,9 +22,9 @@
 //  PostDominatorTree Implementation
 //===----------------------------------------------------------------------===//
 
-const int PostDominatorTree::ID = 0;
-const int PostDominanceFrontier::ID = 0;
-const int PostETForest::ID = 0;
+const char PostDominatorTree::ID = 0;
+const char PostDominanceFrontier::ID = 0;
+const char PostETForest::ID = 0;
 static RegisterPass
 F("postdomtree", "Post-Dominator Tree Construction", true);
 


Index: llvm/lib/Analysis/ProfileInfo.cpp
diff -u llvm/lib/Analysis/ProfileInfo.cpp:1.13 llvm/lib/Analysis/ProfileInfo.cpp:1.14
--- llvm/lib/Analysis/ProfileInfo.cpp:1.13	Wed May  2 15:37:47 2007
+++ llvm/lib/Analysis/ProfileInfo.cpp	Wed May  2 16:39:18 2007
@@ -24,7 +24,7 @@
 namespace {
   RegisterAnalysisGroup Z("Profile Information");
 }
-const int ProfileInfo::ID = 0;
+const char ProfileInfo::ID = 0;
 
 ProfileInfo::~ProfileInfo() {}
 
@@ -86,11 +86,11 @@
 namespace {
   struct VISIBILITY_HIDDEN NoProfileInfo 
     : public ImmutablePass, public ProfileInfo {
-    static const int ID; // Class identification, replacement for typeinfo
+    static const char ID; // Class identification, replacement for typeinfo
     NoProfileInfo() : ImmutablePass((intptr_t)&ID) {}
   };
 
-  const int NoProfileInfo::ID = 0;
+  const char NoProfileInfo::ID = 0;
   // Register this pass...
   RegisterPass
   X("no-profile", "No Profile Information");


Index: llvm/lib/Analysis/ProfileInfoLoaderPass.cpp
diff -u llvm/lib/Analysis/ProfileInfoLoaderPass.cpp:1.19 llvm/lib/Analysis/ProfileInfoLoaderPass.cpp:1.20
--- llvm/lib/Analysis/ProfileInfoLoaderPass.cpp:1.19	Tue May  1 16:15:46 2007
+++ llvm/lib/Analysis/ProfileInfoLoaderPass.cpp	Wed May  2 16:39:18 2007
@@ -32,7 +32,7 @@
   class VISIBILITY_HIDDEN LoaderPass : public ModulePass, public ProfileInfo {
     std::string Filename;
   public:
-    static const int ID; // Class identification, replacement for typeinfo
+    static const char ID; // Class identification, replacement for typeinfo
     LoaderPass(const std::string &filename = "")
       : ModulePass((intptr_t)&ID), Filename(filename) {
       if (filename.empty()) Filename = ProfileInfoFilename;
@@ -50,7 +50,7 @@
     virtual bool runOnModule(Module &M);
   };
 
-  const int LoaderPass::ID = 0;
+  const char LoaderPass::ID = 0;
   RegisterPass
   X("profile-loader", "Load profile information from llvmprof.out");
 


Index: llvm/lib/Analysis/ScalarEvolution.cpp
diff -u llvm/lib/Analysis/ScalarEvolution.cpp:1.114 llvm/lib/Analysis/ScalarEvolution.cpp:1.115
--- llvm/lib/Analysis/ScalarEvolution.cpp:1.114	Wed May  2 15:37:47 2007
+++ llvm/lib/Analysis/ScalarEvolution.cpp	Wed May  2 16:39:18 2007
@@ -105,7 +105,7 @@
   RegisterPass
   R("scalar-evolution", "Scalar Evolution Analysis");
 }
-const int ScalarEvolution::ID = 0;
+const char ScalarEvolution::ID = 0;
 
 //===----------------------------------------------------------------------===//
 //                           SCEV class definitions


Index: llvm/lib/Analysis/ValueNumbering.cpp
diff -u llvm/lib/Analysis/ValueNumbering.cpp:1.26 llvm/lib/Analysis/ValueNumbering.cpp:1.27
--- llvm/lib/Analysis/ValueNumbering.cpp:1.26	Tue May  1 16:15:46 2007
+++ llvm/lib/Analysis/ValueNumbering.cpp	Wed May  2 16:39:18 2007
@@ -22,7 +22,7 @@
 #include "llvm/Support/Compiler.h"
 using namespace llvm;
 
-const int ValueNumbering::ID = 0;
+const char ValueNumbering::ID = 0;
 // Register the ValueNumbering interface, providing a nice name to refer to.
 static RegisterAnalysisGroup X("Value Numbering");
 
@@ -52,7 +52,7 @@
   ///
   struct VISIBILITY_HIDDEN BasicVN 
       : public ImmutablePass, public ValueNumbering {
-    static const int ID; // Class identification, replacement for typeinfo
+    static const char ID; // Class identification, replacement for typeinfo
     BasicVN() : ImmutablePass((intptr_t)&ID) {}
 
     /// getEqualNumberNodes - Return nodes with the same value number as the
@@ -65,7 +65,7 @@
                                      std::vector &RetVals) const;
   };
 
-  const int BasicVN::ID = 0;
+  const char BasicVN::ID = 0;
   // Register this pass...
   RegisterPass
   X("basicvn", "Basic Value Numbering (default GVN impl)");





From dpatel at apple.com  Wed May  2 16:41:35 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 16:41:35 -0500
Subject: [llvm-commits] CVS: llvm/lib/Analysis/IPA/Andersens.cpp
	CallGraph.cpp CallGraphSCCPass.cpp FindUsedTypes.cpp
	GlobalsModRef.cpp
Message-ID: <200705022141.l42LfZVG024495@zion.cs.uiuc.edu>



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 {
   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 X("anders-aa",
                             "Andersen's Interprocedural Alias Analysis");
   RegisterAnalysisGroup 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 X("Call Graph");
 RegisterPass Y("basiccg", "Basic CallGraph Construction");
 RegisterAnalysisGroup 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
 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 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 X("globalsmodref-aa",
                                 "Simple mod/ref analysis for globals");
   RegisterAnalysisGroup Y(X);





From dpatel at apple.com  Wed May  2 16:41:38 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 16:41:38 -0500
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/AsmPrinter.cpp
	BranchFolding.cpp ELFWriter.cpp ELFWriter.h
	LiveIntervalAnalysis.cpp LiveVariables.cpp MachOWriter.cpp
	MachOWriter.h MachineFunction.cpp MachineModuleInfo.cpp
	PHIElimination.cpp PrologEpilogInserter.cpp
	RegAllocLinearScan.cpp RegAllocLocal.cpp RegAllocSimple.cpp
	TwoAddressInstructionPass.cpp UnreachableBlockElim.cpp
Message-ID: <200705022141.l42LfcaU024653@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen:

AsmPrinter.cpp updated: 1.161 -> 1.162
BranchFolding.cpp updated: 1.47 -> 1.48
ELFWriter.cpp updated: 1.39 -> 1.40
ELFWriter.h updated: 1.2 -> 1.3
LiveIntervalAnalysis.cpp updated: 1.241 -> 1.242
LiveVariables.cpp updated: 1.80 -> 1.81
MachOWriter.cpp updated: 1.33 -> 1.34
MachOWriter.h updated: 1.4 -> 1.5
MachineFunction.cpp updated: 1.112 -> 1.113
MachineModuleInfo.cpp updated: 1.7 -> 1.8
PHIElimination.cpp updated: 1.58 -> 1.59
PrologEpilogInserter.cpp updated: 1.85 -> 1.86
RegAllocLinearScan.cpp updated: 1.146 -> 1.147
RegAllocLocal.cpp updated: 1.103 -> 1.104
RegAllocSimple.cpp updated: 1.84 -> 1.85
TwoAddressInstructionPass.cpp updated: 1.48 -> 1.49
UnreachableBlockElim.cpp updated: 1.10 -> 1.11
---
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:  (+30 -30)

 AsmPrinter.cpp                |    2 +-
 BranchFolding.cpp             |    4 ++--
 ELFWriter.cpp                 |    2 +-
 ELFWriter.h                   |    2 +-
 LiveIntervalAnalysis.cpp      |    2 +-
 LiveVariables.cpp             |    2 +-
 MachOWriter.cpp               |    2 +-
 MachOWriter.h                 |    2 +-
 MachineFunction.cpp           |    8 ++++----
 MachineModuleInfo.cpp         |    6 +++---
 PHIElimination.cpp            |    4 ++--
 PrologEpilogInserter.cpp      |    4 ++--
 RegAllocLinearScan.cpp        |    4 ++--
 RegAllocLocal.cpp             |    4 ++--
 RegAllocSimple.cpp            |    4 ++--
 TwoAddressInstructionPass.cpp |    4 ++--
 UnreachableBlockElim.cpp      |    4 ++--
 17 files changed, 30 insertions(+), 30 deletions(-)


Index: llvm/lib/CodeGen/AsmPrinter.cpp
diff -u llvm/lib/CodeGen/AsmPrinter.cpp:1.161 llvm/lib/CodeGen/AsmPrinter.cpp:1.162
--- llvm/lib/CodeGen/AsmPrinter.cpp:1.161	Tue May  1 16:15:46 2007
+++ llvm/lib/CodeGen/AsmPrinter.cpp	Wed May  2 16:39:18 2007
@@ -32,7 +32,7 @@
 static cl::opt
 AsmVerbose("asm-verbose", cl::Hidden, cl::desc("Add comments to directives."));
 
-const int AsmPrinter::ID = 0;
+const char AsmPrinter::ID = 0;
 AsmPrinter::AsmPrinter(std::ostream &o, TargetMachine &tm,
                        const TargetAsmInfo *T)
   : MachineFunctionPass((intptr_t)&ID), FunctionNumber(0), O(o), TM(tm), TAI(T)


Index: llvm/lib/CodeGen/BranchFolding.cpp
diff -u llvm/lib/CodeGen/BranchFolding.cpp:1.47 llvm/lib/CodeGen/BranchFolding.cpp:1.48
--- llvm/lib/CodeGen/BranchFolding.cpp:1.47	Tue May  1 16:15:46 2007
+++ llvm/lib/CodeGen/BranchFolding.cpp	Wed May  2 16:39:18 2007
@@ -39,7 +39,7 @@
 
 namespace {
   struct BranchFolder : public MachineFunctionPass {
-    static const int ID;
+    static const char ID;
     BranchFolder() : MachineFunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnMachineFunction(MachineFunction &MF);
@@ -67,7 +67,7 @@
                         MachineBasicBlock *TBB, MachineBasicBlock *FBB,
                         const std::vector &Cond);
   };
-  const int BranchFolder::ID = 0;
+  const char BranchFolder::ID = 0;
 }
 
 FunctionPass *llvm::createBranchFoldingPass() { return new BranchFolder(); }


Index: llvm/lib/CodeGen/ELFWriter.cpp
diff -u llvm/lib/CodeGen/ELFWriter.cpp:1.39 llvm/lib/CodeGen/ELFWriter.cpp:1.40
--- llvm/lib/CodeGen/ELFWriter.cpp:1.39	Tue May  1 16:15:46 2007
+++ llvm/lib/CodeGen/ELFWriter.cpp	Wed May  2 16:39:18 2007
@@ -47,7 +47,7 @@
 #include 
 using namespace llvm;
 
-const int ELFWriter::ID = 0;
+const char ELFWriter::ID = 0;
 /// AddELFWriter - Concrete function to add the ELF writer to the function pass
 /// manager.
 MachineCodeEmitter *llvm::AddELFWriter(FunctionPassManager &FPM,


Index: llvm/lib/CodeGen/ELFWriter.h
diff -u llvm/lib/CodeGen/ELFWriter.h:1.2 llvm/lib/CodeGen/ELFWriter.h:1.3
--- llvm/lib/CodeGen/ELFWriter.h:1.2	Tue May  1 16:15:46 2007
+++ llvm/lib/CodeGen/ELFWriter.h	Wed May  2 16:39:18 2007
@@ -30,7 +30,7 @@
   class ELFWriter : public MachineFunctionPass {
     friend class ELFCodeEmitter;
   public:
-    static const int ID;
+    static const char ID;
 
     MachineCodeEmitter &getMachineCodeEmitter() const {
       return *(MachineCodeEmitter*)MCE;


Index: llvm/lib/CodeGen/LiveIntervalAnalysis.cpp
diff -u llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.241 llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.242
--- llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.241	Wed May  2 15:37:47 2007
+++ llvm/lib/CodeGen/LiveIntervalAnalysis.cpp	Wed May  2 16:39:18 2007
@@ -44,7 +44,7 @@
 STATISTIC(numFolded   , "Number of loads/stores folded into instructions");
 STATISTIC(numAborts   , "Number of times interval joining aborted");
 
-const int LiveIntervals::ID = 0;
+const char LiveIntervals::ID = 0;
 namespace {
   RegisterPass X("liveintervals", "Live Interval Analysis");
 


Index: llvm/lib/CodeGen/LiveVariables.cpp
diff -u llvm/lib/CodeGen/LiveVariables.cpp:1.80 llvm/lib/CodeGen/LiveVariables.cpp:1.81
--- llvm/lib/CodeGen/LiveVariables.cpp:1.80	Tue May  1 16:15:46 2007
+++ llvm/lib/CodeGen/LiveVariables.cpp	Wed May  2 16:39:18 2007
@@ -37,7 +37,7 @@
 #include 
 using namespace llvm;
 
-const int LiveVariables::ID = 0;
+const char LiveVariables::ID = 0;
 static RegisterPass X("livevars", "Live Variable Analysis");
 
 void LiveVariables::VarInfo::dump() const {


Index: llvm/lib/CodeGen/MachOWriter.cpp
diff -u llvm/lib/CodeGen/MachOWriter.cpp:1.33 llvm/lib/CodeGen/MachOWriter.cpp:1.34
--- llvm/lib/CodeGen/MachOWriter.cpp:1.33	Tue May  1 16:15:46 2007
+++ llvm/lib/CodeGen/MachOWriter.cpp	Wed May  2 16:39:19 2007
@@ -317,7 +317,7 @@
 //                          MachOWriter Implementation
 //===----------------------------------------------------------------------===//
 
-const int MachOWriter::ID = 0;
+const char MachOWriter::ID = 0;
 MachOWriter::MachOWriter(std::ostream &o, TargetMachine &tm) 
   : MachineFunctionPass((intptr_t)&ID), O(o), TM(tm) {
   is64Bit = TM.getTargetData()->getPointerSizeInBits() == 64;


Index: llvm/lib/CodeGen/MachOWriter.h
diff -u llvm/lib/CodeGen/MachOWriter.h:1.4 llvm/lib/CodeGen/MachOWriter.h:1.5
--- llvm/lib/CodeGen/MachOWriter.h:1.4	Tue May  1 16:15:46 2007
+++ llvm/lib/CodeGen/MachOWriter.h	Wed May  2 16:39:19 2007
@@ -84,7 +84,7 @@
   class MachOWriter : public MachineFunctionPass {
     friend class MachOCodeEmitter;
   public:
-    static const int ID;
+    static const char ID;
     MachineCodeEmitter &getMachineCodeEmitter() const {
       return *(MachineCodeEmitter*)MCE;
     }


Index: llvm/lib/CodeGen/MachineFunction.cpp
diff -u llvm/lib/CodeGen/MachineFunction.cpp:1.112 llvm/lib/CodeGen/MachineFunction.cpp:1.113
--- llvm/lib/CodeGen/MachineFunction.cpp:1.112	Tue May  1 16:15:46 2007
+++ llvm/lib/CodeGen/MachineFunction.cpp	Wed May  2 16:39:19 2007
@@ -44,7 +44,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN Printer : public MachineFunctionPass {
-    static const int ID;
+    static const char ID;
 
     std::ostream *OS;
     const std::string Banner;
@@ -64,7 +64,7 @@
       return false;
     }
   };
-  const int Printer::ID = 0;
+  const char Printer::ID = 0;
 }
 
 /// Returns a newly-created MachineFunction Printer pass. The default output
@@ -77,7 +77,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN Deleter : public MachineFunctionPass {
-    static const int ID;
+    static const char ID;
     Deleter() : MachineFunctionPass((intptr_t)&ID) {}
 
     const char *getPassName() const { return "Machine Code Deleter"; }
@@ -88,7 +88,7 @@
       return true;
     }
   };
-  const int Deleter::ID = 0;
+  const char Deleter::ID = 0;
 }
 
 /// MachineCodeDeletion Pass - This pass deletes all of the machine code for


Index: llvm/lib/CodeGen/MachineModuleInfo.cpp
diff -u llvm/lib/CodeGen/MachineModuleInfo.cpp:1.7 llvm/lib/CodeGen/MachineModuleInfo.cpp:1.8
--- llvm/lib/CodeGen/MachineModuleInfo.cpp:1.7	Wed May  2 15:37:47 2007
+++ llvm/lib/CodeGen/MachineModuleInfo.cpp	Wed May  2 16:39:19 2007
@@ -30,7 +30,7 @@
 namespace {
   RegisterPass X("machinemoduleinfo", "Module Information");
 }
-const int MachineModuleInfo::ID = 0;
+const char MachineModuleInfo::ID = 0;
 
 //===----------------------------------------------------------------------===//
 
@@ -1751,14 +1751,14 @@
 namespace llvm {
 
 struct DebugLabelFolder : public MachineFunctionPass {
-  static const int ID;
+  static const char ID;
   DebugLabelFolder() : MachineFunctionPass((intptr_t)&ID) {}
 
   virtual bool runOnMachineFunction(MachineFunction &MF);
   virtual const char *getPassName() const { return "Label Folder"; }
 };
 
-const int  DebugLabelFolder::ID = 0;
+const char DebugLabelFolder::ID = 0;
 
 bool DebugLabelFolder::runOnMachineFunction(MachineFunction &MF) {
   // Get machine module info.


Index: llvm/lib/CodeGen/PHIElimination.cpp
diff -u llvm/lib/CodeGen/PHIElimination.cpp:1.58 llvm/lib/CodeGen/PHIElimination.cpp:1.59
--- llvm/lib/CodeGen/PHIElimination.cpp:1.58	Tue May  1 16:15:46 2007
+++ llvm/lib/CodeGen/PHIElimination.cpp	Wed May  2 16:39:19 2007
@@ -33,7 +33,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN PNE : public MachineFunctionPass {
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     PNE() : MachineFunctionPass((intptr_t)&ID) {}
 
     bool runOnMachineFunction(MachineFunction &Fn) {
@@ -76,7 +76,7 @@
     VRegPHIUse VRegPHIUseCount;
   };
 
-  const int PNE::ID = 0;
+  const char PNE::ID = 0;
   RegisterPass X("phi-node-elimination",
                       "Eliminate PHI nodes for register allocation");
 }


Index: llvm/lib/CodeGen/PrologEpilogInserter.cpp
diff -u llvm/lib/CodeGen/PrologEpilogInserter.cpp:1.85 llvm/lib/CodeGen/PrologEpilogInserter.cpp:1.86
--- llvm/lib/CodeGen/PrologEpilogInserter.cpp:1.85	Tue May  1 16:15:46 2007
+++ llvm/lib/CodeGen/PrologEpilogInserter.cpp	Wed May  2 16:39:19 2007
@@ -32,7 +32,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN PEI : public MachineFunctionPass {
-    static const int ID;
+    static const char ID;
     PEI() : MachineFunctionPass((intptr_t)&ID) {}
 
     const char *getPassName() const {
@@ -101,7 +101,7 @@
     void replaceFrameIndices(MachineFunction &Fn);
     void insertPrologEpilogCode(MachineFunction &Fn);
   };
-  const int PEI::ID = 0;
+  const char PEI::ID = 0;
 }
 
 


Index: llvm/lib/CodeGen/RegAllocLinearScan.cpp
diff -u llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.146 llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.147
--- llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.146	Tue May  1 16:15:46 2007
+++ llvm/lib/CodeGen/RegAllocLinearScan.cpp	Wed May  2 16:39:19 2007
@@ -48,7 +48,7 @@
   static unsigned numIntervals = 0;
 
   struct VISIBILITY_HIDDEN RA : public MachineFunctionPass {
-    static const int ID;
+    static const char ID;
     RA() : MachineFunctionPass((intptr_t)&ID) {}
 
     typedef std::pair IntervalPtr;
@@ -149,7 +149,7 @@
       }
     }
   };
-  const int RA::ID = 0;
+  const char RA::ID = 0;
 }
 
 void RA::ComputeRelatedRegClasses() {


Index: llvm/lib/CodeGen/RegAllocLocal.cpp
diff -u llvm/lib/CodeGen/RegAllocLocal.cpp:1.103 llvm/lib/CodeGen/RegAllocLocal.cpp:1.104
--- llvm/lib/CodeGen/RegAllocLocal.cpp:1.103	Tue May  1 16:15:46 2007
+++ llvm/lib/CodeGen/RegAllocLocal.cpp	Wed May  2 16:39:19 2007
@@ -44,7 +44,7 @@
 
   class VISIBILITY_HIDDEN RA : public MachineFunctionPass {
   public:
-    static const int ID;
+    static const char ID;
     RA() : MachineFunctionPass((intptr_t)&ID) {}
   private:
     const TargetMachine *TM;
@@ -228,7 +228,7 @@
     void reloadPhysReg(MachineBasicBlock &MBB, MachineBasicBlock::iterator &I,
                        unsigned PhysReg);
   };
-  const int RA::ID = 0;
+  const char RA::ID = 0;
 }
 
 /// getStackSpaceFor - This allocates space for the specified virtual register


Index: llvm/lib/CodeGen/RegAllocSimple.cpp
diff -u llvm/lib/CodeGen/RegAllocSimple.cpp:1.84 llvm/lib/CodeGen/RegAllocSimple.cpp:1.85
--- llvm/lib/CodeGen/RegAllocSimple.cpp:1.84	Tue May  1 16:15:46 2007
+++ llvm/lib/CodeGen/RegAllocSimple.cpp	Wed May  2 16:39:19 2007
@@ -39,7 +39,7 @@
 
   class VISIBILITY_HIDDEN RegAllocSimple : public MachineFunctionPass {
   public:
-    static const int ID;
+    static const char ID;
     RegAllocSimple() : MachineFunctionPass((intptr_t)&ID) {}
   private:
     MachineFunction *MF;
@@ -94,7 +94,7 @@
     void spillVirtReg(MachineBasicBlock &MBB, MachineBasicBlock::iterator I,
                       unsigned VirtReg, unsigned PhysReg);
   };
-  const int RegAllocSimple::ID = 0;
+  const char RegAllocSimple::ID = 0;
 }
 
 /// getStackSpaceFor - This allocates space for the specified virtual


Index: llvm/lib/CodeGen/TwoAddressInstructionPass.cpp
diff -u llvm/lib/CodeGen/TwoAddressInstructionPass.cpp:1.48 llvm/lib/CodeGen/TwoAddressInstructionPass.cpp:1.49
--- llvm/lib/CodeGen/TwoAddressInstructionPass.cpp:1.48	Tue May  1 16:15:46 2007
+++ llvm/lib/CodeGen/TwoAddressInstructionPass.cpp	Wed May  2 16:39:19 2007
@@ -50,7 +50,7 @@
 namespace {
   struct VISIBILITY_HIDDEN TwoAddressInstructionPass
    : public MachineFunctionPass {
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     TwoAddressInstructionPass() : MachineFunctionPass((intptr_t)&ID) {}
 
     virtual void getAnalysisUsage(AnalysisUsage &AU) const;
@@ -59,7 +59,7 @@
     bool runOnMachineFunction(MachineFunction&);
   };
 
-  const int TwoAddressInstructionPass::ID = 0;
+  const char TwoAddressInstructionPass::ID = 0;
   RegisterPass
   X("twoaddressinstruction", "Two-Address instruction pass");
 }


Index: llvm/lib/CodeGen/UnreachableBlockElim.cpp
diff -u llvm/lib/CodeGen/UnreachableBlockElim.cpp:1.10 llvm/lib/CodeGen/UnreachableBlockElim.cpp:1.11
--- llvm/lib/CodeGen/UnreachableBlockElim.cpp:1.10	Tue May  1 16:15:46 2007
+++ llvm/lib/CodeGen/UnreachableBlockElim.cpp	Wed May  2 16:39:19 2007
@@ -35,10 +35,10 @@
   class VISIBILITY_HIDDEN UnreachableBlockElim : public FunctionPass {
     virtual bool runOnFunction(Function &F);
   public:
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     UnreachableBlockElim() : FunctionPass((intptr_t)&ID) {}
   };
-  const int UnreachableBlockElim::ID = 0;
+  const char UnreachableBlockElim::ID = 0;
   RegisterPass
   X("unreachableblockelim", "Remove unreachable blocks from the CFG");
 }





From dpatel at apple.com  Wed May  2 16:41:36 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 16:41:36 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/ADCE.cpp
	BasicBlockPlacement.cpp CodeGenPrepare.cpp CondPropagate.cpp
	ConstantProp.cpp CorrelatedExprs.cpp DCE.cpp
	DeadStoreElimination.cpp GCSE.cpp IndVarSimplify.cpp
	InstructionCombining.cpp LICM.cpp LoopRotation.cpp
	LoopStrengthReduce.cpp LoopUnroll.cpp LoopUnswitch.cpp
	LowerGC.cpp LowerPacked.cpp PredicateSimplifier.cpp
	Reassociate.cpp Reg2Mem.cpp SCCP.cpp ScalarReplAggregates.cpp
	SimplifyCFG.cpp TailDuplication.cpp TailRecursionElimination.cpp
Message-ID: <200705022141.l42LfaoB024539@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

ADCE.cpp updated: 1.107 -> 1.108
BasicBlockPlacement.cpp updated: 1.10 -> 1.11
CodeGenPrepare.cpp updated: 1.7 -> 1.8
CondPropagate.cpp updated: 1.19 -> 1.20
ConstantProp.cpp updated: 1.57 -> 1.58
CorrelatedExprs.cpp updated: 1.58 -> 1.59
DCE.cpp updated: 1.64 -> 1.65
DeadStoreElimination.cpp updated: 1.18 -> 1.19
GCSE.cpp updated: 1.54 -> 1.55
IndVarSimplify.cpp updated: 1.116 -> 1.117
InstructionCombining.cpp updated: 1.755 -> 1.756
LICM.cpp updated: 1.97 -> 1.98
LoopRotation.cpp updated: 1.11 -> 1.12
LoopStrengthReduce.cpp updated: 1.132 -> 1.133
LoopUnroll.cpp updated: 1.40 -> 1.41
LoopUnswitch.cpp updated: 1.66 -> 1.67
LowerGC.cpp updated: 1.23 -> 1.24
LowerPacked.cpp updated: 1.22 -> 1.23
PredicateSimplifier.cpp updated: 1.72 -> 1.73
Reassociate.cpp updated: 1.79 -> 1.80
Reg2Mem.cpp updated: 1.13 -> 1.14
SCCP.cpp updated: 1.166 -> 1.167
ScalarReplAggregates.cpp updated: 1.91 -> 1.92
SimplifyCFG.cpp updated: 1.22 -> 1.23
TailDuplication.cpp updated: 1.38 -> 1.39
TailRecursionElimination.cpp updated: 1.31 -> 1.32
---
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:  (+56 -56)

 ADCE.cpp                     |    4 ++--
 BasicBlockPlacement.cpp      |    4 ++--
 CodeGenPrepare.cpp           |    4 ++--
 CondPropagate.cpp            |    4 ++--
 ConstantProp.cpp             |    4 ++--
 CorrelatedExprs.cpp          |    4 ++--
 DCE.cpp                      |    8 ++++----
 DeadStoreElimination.cpp     |    4 ++--
 GCSE.cpp                     |    4 ++--
 IndVarSimplify.cpp           |    4 ++--
 InstructionCombining.cpp     |    4 ++--
 LICM.cpp                     |    4 ++--
 LoopRotation.cpp             |    4 ++--
 LoopStrengthReduce.cpp       |    4 ++--
 LoopUnroll.cpp               |    4 ++--
 LoopUnswitch.cpp             |    4 ++--
 LowerGC.cpp                  |    4 ++--
 LowerPacked.cpp              |    4 ++--
 PredicateSimplifier.cpp      |    4 ++--
 Reassociate.cpp              |    4 ++--
 Reg2Mem.cpp                  |    4 ++--
 SCCP.cpp                     |    8 ++++----
 ScalarReplAggregates.cpp     |    4 ++--
 SimplifyCFG.cpp              |    4 ++--
 TailDuplication.cpp          |    4 ++--
 TailRecursionElimination.cpp |    4 ++--
 26 files changed, 56 insertions(+), 56 deletions(-)


Index: llvm/lib/Transforms/Scalar/ADCE.cpp
diff -u llvm/lib/Transforms/Scalar/ADCE.cpp:1.107 llvm/lib/Transforms/Scalar/ADCE.cpp:1.108
--- llvm/lib/Transforms/Scalar/ADCE.cpp:1.107	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Scalar/ADCE.cpp	Wed May  2 16:39:19 2007
@@ -52,7 +52,7 @@
   // The public interface for this class
   //
 public:
-  static const int ID; // Pass identifcation, replacement for typeid
+  static const char ID; // Pass identifcation, replacement for typeid
   ADCE() : FunctionPass((intptr_t)&ID) {}
 
   // Execute the Aggressive Dead Code Elimination Algorithm
@@ -107,7 +107,7 @@
   }
 };
 
-  const int ADCE::ID = 0;
+  const char ADCE::ID = 0;
   RegisterPass X("adce", "Aggressive Dead Code Elimination");
 } // End of anonymous namespace
 


Index: llvm/lib/Transforms/Scalar/BasicBlockPlacement.cpp
diff -u llvm/lib/Transforms/Scalar/BasicBlockPlacement.cpp:1.10 llvm/lib/Transforms/Scalar/BasicBlockPlacement.cpp:1.11
--- llvm/lib/Transforms/Scalar/BasicBlockPlacement.cpp:1.10	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Scalar/BasicBlockPlacement.cpp	Wed May  2 16:39:19 2007
@@ -41,7 +41,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN BlockPlacement : public FunctionPass {
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     BlockPlacement() : FunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnFunction(Function &F);
@@ -73,7 +73,7 @@
     void PlaceBlocks(BasicBlock *BB);
   };
 
-  const int BlockPlacement::ID = 0;
+  const char BlockPlacement::ID = 0;
   RegisterPass X("block-placement",
                                  "Profile Guided Basic Block Placement");
 }


Index: llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp
diff -u llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp:1.7 llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp:1.8
--- llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp:1.7	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp	Wed May  2 16:39:19 2007
@@ -39,7 +39,7 @@
     /// transformation profitability.
     const TargetLowering *TLI;
   public:
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     CodeGenPrepare(const TargetLowering *tli = 0) : FunctionPass((intptr_t)&ID),
       TLI(tli) {}
     bool runOnFunction(Function &F);
@@ -55,7 +55,7 @@
   };
 }
 
-const int CodeGenPrepare::ID = 0;
+const char CodeGenPrepare::ID = 0;
 static RegisterPass X("codegenprepare",
                                       "Optimize for code generation");
 


Index: llvm/lib/Transforms/Scalar/CondPropagate.cpp
diff -u llvm/lib/Transforms/Scalar/CondPropagate.cpp:1.19 llvm/lib/Transforms/Scalar/CondPropagate.cpp:1.20
--- llvm/lib/Transforms/Scalar/CondPropagate.cpp:1.19	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Scalar/CondPropagate.cpp	Wed May  2 16:39:19 2007
@@ -31,7 +31,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN CondProp : public FunctionPass {
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     CondProp() : FunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnFunction(Function &F);
@@ -49,7 +49,7 @@
     void RevectorBlockTo(BasicBlock *FromBB, BasicBlock *ToBB);
   };
   
-  const int CondProp::ID = 0;
+  const char CondProp::ID = 0;
   RegisterPass X("condprop", "Conditional Propagation");
 }
 


Index: llvm/lib/Transforms/Scalar/ConstantProp.cpp
diff -u llvm/lib/Transforms/Scalar/ConstantProp.cpp:1.57 llvm/lib/Transforms/Scalar/ConstantProp.cpp:1.58
--- llvm/lib/Transforms/Scalar/ConstantProp.cpp:1.57	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Scalar/ConstantProp.cpp	Wed May  2 16:39:19 2007
@@ -34,7 +34,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN ConstantPropagation : public FunctionPass {
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     ConstantPropagation() : FunctionPass((intptr_t)&ID) {}
 
     bool runOnFunction(Function &F);
@@ -44,7 +44,7 @@
     }
   };
 
-  const int ConstantPropagation::ID = 0;
+  const char ConstantPropagation::ID = 0;
   RegisterPass X("constprop",
                                       "Simple constant propagation");
 }


Index: llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp
diff -u llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp:1.58 llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp:1.59
--- llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp:1.58	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp	Wed May  2 16:39:19 2007
@@ -225,7 +225,7 @@
     std::map RegionInfoMap;
     ETForest *EF;
   public:
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     CEE() : FunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnFunction(Function &F);
@@ -288,7 +288,7 @@
     bool SimplifyInstruction(Instruction *Inst, const RegionInfo &RI);
   };
   
-  const int CEE::ID = 0;
+  const char CEE::ID = 0;
   RegisterPass X("cee", "Correlated Expression Elimination");
 }
 


Index: llvm/lib/Transforms/Scalar/DCE.cpp
diff -u llvm/lib/Transforms/Scalar/DCE.cpp:1.64 llvm/lib/Transforms/Scalar/DCE.cpp:1.65
--- llvm/lib/Transforms/Scalar/DCE.cpp:1.64	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Scalar/DCE.cpp	Wed May  2 16:39:19 2007
@@ -35,7 +35,7 @@
   // DeadInstElimination pass implementation
   //
   struct VISIBILITY_HIDDEN DeadInstElimination : public BasicBlockPass {
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     DeadInstElimination() : BasicBlockPass(intptr_t(&ID)) {}
     virtual bool runOnBasicBlock(BasicBlock &BB) {
       bool Changed = false;
@@ -53,7 +53,7 @@
     }
   };
 
-  const int DeadInstElimination::ID = 0;
+  const char DeadInstElimination::ID = 0;
   RegisterPass X("die", "Dead Instruction Elimination");
 }
 
@@ -67,7 +67,7 @@
   // DeadCodeElimination pass implementation
   //
   struct DCE : public FunctionPass {
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     DCE() : FunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnFunction(Function &F);
@@ -77,7 +77,7 @@
     }
  };
 
-  const int DCE::ID = 0;
+  const char DCE::ID = 0;
   RegisterPass Y("dce", "Dead Code Elimination");
 }
 


Index: llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp
diff -u llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp:1.18 llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp:1.19
--- llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp:1.18	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp	Wed May  2 16:39:19 2007
@@ -34,7 +34,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN DSE : public FunctionPass {
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     DSE() : FunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnFunction(Function &F) {
@@ -58,7 +58,7 @@
       AU.addPreserved();
     }
   };
-  const int DSE::ID = 0;
+  const char DSE::ID = 0;
   RegisterPass X("dse", "Dead Store Elimination");
 }
 


Index: llvm/lib/Transforms/Scalar/GCSE.cpp
diff -u llvm/lib/Transforms/Scalar/GCSE.cpp:1.54 llvm/lib/Transforms/Scalar/GCSE.cpp:1.55
--- llvm/lib/Transforms/Scalar/GCSE.cpp:1.54	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Scalar/GCSE.cpp	Wed May  2 16:39:19 2007
@@ -37,7 +37,7 @@
                           "with constant values");
 namespace {
   struct VISIBILITY_HIDDEN GCSE : public FunctionPass {
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     GCSE() : FunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnFunction(Function &F);
@@ -54,7 +54,7 @@
     }
   };
 
-  const int GCSE::ID = 0;
+  const char GCSE::ID = 0;
   RegisterPass X("gcse", "Global Common Subexpression Elimination");
 }
 


Index: llvm/lib/Transforms/Scalar/IndVarSimplify.cpp
diff -u llvm/lib/Transforms/Scalar/IndVarSimplify.cpp:1.116 llvm/lib/Transforms/Scalar/IndVarSimplify.cpp:1.117
--- llvm/lib/Transforms/Scalar/IndVarSimplify.cpp:1.116	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Scalar/IndVarSimplify.cpp	Wed May  2 16:39:19 2007
@@ -69,7 +69,7 @@
     bool Changed;
   public:
 
-   static const int ID; // Pass identifcation, replacement for typeid
+   static const char ID; // Pass identifcation, replacement for typeid
    IndVarSimplify() : LoopPass((intptr_t)&ID) {}
 
    bool runOnLoop(Loop *L, LPPassManager &LPM);
@@ -95,7 +95,7 @@
     void DeleteTriviallyDeadInstructions(std::set &Insts);
   };
 
-  const int IndVarSimplify::ID = 0;
+  const char IndVarSimplify::ID = 0;
   RegisterPass X("indvars", "Canonicalize Induction Variables");
 }
 


Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.755 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.756
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.755	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Wed May  2 16:39:19 2007
@@ -76,7 +76,7 @@
     TargetData *TD;
     bool MustPreserveLCSSA;
   public:
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     InstCombiner() : FunctionPass((intptr_t)&ID) {}
 
     /// AddToWorkList - Add the specified instruction to the worklist if it
@@ -361,7 +361,7 @@
     Value *EvaluateInDifferentType(Value *V, const Type *Ty, bool isSigned);
   };
 
-  const int InstCombiner::ID = 0;
+  const char InstCombiner::ID = 0;
   RegisterPass X("instcombine", "Combine redundant instructions");
 }
 


Index: llvm/lib/Transforms/Scalar/LICM.cpp
diff -u llvm/lib/Transforms/Scalar/LICM.cpp:1.97 llvm/lib/Transforms/Scalar/LICM.cpp:1.98
--- llvm/lib/Transforms/Scalar/LICM.cpp:1.97	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Scalar/LICM.cpp	Wed May  2 16:39:19 2007
@@ -63,7 +63,7 @@
                    cl::desc("Disable memory promotion in LICM pass"));
 
   struct VISIBILITY_HIDDEN LICM : public LoopPass {
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     LICM() : LoopPass((intptr_t)&ID) {}
 
     virtual bool runOnLoop(Loop *L, LPPassManager &LPM);
@@ -204,7 +204,7 @@
                                     std::map &Val2AlMap);
   };
 
-  const int LICM::ID = 0;
+  const char LICM::ID = 0;
   RegisterPass X("licm", "Loop Invariant Code Motion");
 }
 


Index: llvm/lib/Transforms/Scalar/LoopRotation.cpp
diff -u llvm/lib/Transforms/Scalar/LoopRotation.cpp:1.11 llvm/lib/Transforms/Scalar/LoopRotation.cpp:1.12
--- llvm/lib/Transforms/Scalar/LoopRotation.cpp:1.11	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Scalar/LoopRotation.cpp	Wed May  2 16:39:19 2007
@@ -44,7 +44,7 @@
   class VISIBILITY_HIDDEN LoopRotate : public LoopPass {
 
   public:
-    static const int ID; // Pass ID, replacement for typeid
+    static const char ID; // Pass ID, replacement for typeid
     LoopRotate() : LoopPass((intptr_t)&ID) {}
 
     // Rotate Loop L as many times as possible. Return true if
@@ -94,7 +94,7 @@
     SmallVector LoopHeaderInfo;
   };
   
-  const int LoopRotate::ID = 0;
+  const char LoopRotate::ID = 0;
   RegisterPass X ("loop-rotate", "Rotate Loops");
 }
 


Index: llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp
diff -u llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp:1.132 llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp:1.133
--- llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp:1.132	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp	Wed May  2 16:39:19 2007
@@ -143,7 +143,7 @@
     const TargetLowering *TLI;
 
   public:
-    static const int ID; // Pass ID, replacement for typeid
+    static const char ID; // Pass ID, replacement for typeid
     LoopStrengthReduce(const TargetLowering *tli = NULL) : 
       LoopPass((intptr_t)&ID), TLI(tli) {
     }
@@ -188,7 +188,7 @@
                                       Loop *L, bool isOnlyStride);
     void DeleteTriviallyDeadInstructions(std::set &Insts);
   };
-  const int LoopStrengthReduce::ID = 0;
+  const char LoopStrengthReduce::ID = 0;
   RegisterPass X("loop-reduce", "Loop Strength Reduction");
 }
 


Index: llvm/lib/Transforms/Scalar/LoopUnroll.cpp
diff -u llvm/lib/Transforms/Scalar/LoopUnroll.cpp:1.40 llvm/lib/Transforms/Scalar/LoopUnroll.cpp:1.41
--- llvm/lib/Transforms/Scalar/LoopUnroll.cpp:1.40	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Scalar/LoopUnroll.cpp	Wed May  2 16:39:19 2007
@@ -49,7 +49,7 @@
   class VISIBILITY_HIDDEN LoopUnroll : public LoopPass {
     LoopInfo *LI;  // The current loop information
   public:
-    static const int ID; // Pass ID, replacement for typeid
+    static const char ID; // Pass ID, replacement for typeid
     LoopUnroll()  : LoopPass((intptr_t)&ID) {}
 
     bool runOnLoop(Loop *L, LPPassManager &LPM);
@@ -66,7 +66,7 @@
       AU.addPreserved();
     }
   };
-  const int LoopUnroll::ID = 0;
+  const char LoopUnroll::ID = 0;
   RegisterPass X("loop-unroll", "Unroll loops");
 }
 


Index: llvm/lib/Transforms/Scalar/LoopUnswitch.cpp
diff -u llvm/lib/Transforms/Scalar/LoopUnswitch.cpp:1.66 llvm/lib/Transforms/Scalar/LoopUnswitch.cpp:1.67
--- llvm/lib/Transforms/Scalar/LoopUnswitch.cpp:1.66	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Scalar/LoopUnswitch.cpp	Wed May  2 16:39:19 2007
@@ -69,7 +69,7 @@
     SmallPtrSet UnswitchedVals;
 
   public:
-    static const int ID; // Pass ID, replacement for typeid
+    static const char ID; // Pass ID, replacement for typeid
     LoopUnswitch() : LoopPass((intptr_t)&ID) {}
 
     bool runOnLoop(Loop *L, LPPassManager &LPM);
@@ -112,7 +112,7 @@
                            std::vector &Worklist);
     void RemoveLoopFromHierarchy(Loop *L);
   };
-  const int LoopUnswitch::ID = 0;
+  const char LoopUnswitch::ID = 0;
   RegisterPass X("loop-unswitch", "Unswitch loops");
 }
 


Index: llvm/lib/Transforms/Scalar/LowerGC.cpp
diff -u llvm/lib/Transforms/Scalar/LowerGC.cpp:1.23 llvm/lib/Transforms/Scalar/LowerGC.cpp:1.24
--- llvm/lib/Transforms/Scalar/LowerGC.cpp:1.23	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Scalar/LowerGC.cpp	Wed May  2 16:39:19 2007
@@ -47,7 +47,7 @@
     /// had zero roots.
     const Type *MainRootRecordType;
   public:
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     LowerGC() : FunctionPass((intptr_t)&ID), 
                 GCRootInt(0), GCReadInt(0), GCWriteInt(0),
                 GCRead(0), GCWrite(0), RootChain(0), MainRootRecordType(0) {}
@@ -58,7 +58,7 @@
     const StructType *getRootRecordType(unsigned NumRoots);
   };
 
-  const int LowerGC::ID = 0;
+  const char LowerGC::ID = 0;
   RegisterPass
   X("lowergc", "Lower GC intrinsics, for GCless code generators");
 }


Index: llvm/lib/Transforms/Scalar/LowerPacked.cpp
diff -u llvm/lib/Transforms/Scalar/LowerPacked.cpp:1.22 llvm/lib/Transforms/Scalar/LowerPacked.cpp:1.23
--- llvm/lib/Transforms/Scalar/LowerPacked.cpp:1.22	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Scalar/LowerPacked.cpp	Wed May  2 16:39:19 2007
@@ -40,7 +40,7 @@
 class VISIBILITY_HIDDEN LowerPacked 
   : public FunctionPass, public InstVisitor {
 public:
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     LowerPacked() : FunctionPass((intptr_t)&ID) {}
 
    /// @brief Lowers packed operations to scalar operations.
@@ -107,7 +107,7 @@
    std::vector instrsToRemove;
 };
 
-const int LowerPacked::ID = 0;
+const char LowerPacked::ID = 0;
 RegisterPass
 X("lower-packed",
   "lowers packed operations to operations on smaller packed datatypes");


Index: llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp
diff -u llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp:1.72 llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp:1.73
--- llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp:1.72	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp	Wed May  2 16:39:19 2007
@@ -1989,7 +1989,7 @@
     std::vector WorkList;
 
   public:
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     PredicateSimplifier() : FunctionPass((intptr_t)&ID) {}
 
     bool runOnFunction(Function &F);
@@ -2377,7 +2377,7 @@
     }
   }
 
-  const int PredicateSimplifier::ID = 0;
+  const char PredicateSimplifier::ID = 0;
   RegisterPass X("predsimplify",
                                       "Predicate Simplifier");
 }


Index: llvm/lib/Transforms/Scalar/Reassociate.cpp
diff -u llvm/lib/Transforms/Scalar/Reassociate.cpp:1.79 llvm/lib/Transforms/Scalar/Reassociate.cpp:1.80
--- llvm/lib/Transforms/Scalar/Reassociate.cpp:1.79	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Scalar/Reassociate.cpp	Wed May  2 16:39:19 2007
@@ -69,7 +69,7 @@
     std::map ValueRankMap;
     bool MadeChange;
   public:
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     Reassociate() : FunctionPass((intptr_t)&ID) {}
 
     bool runOnFunction(Function &F);
@@ -92,7 +92,7 @@
     void RemoveDeadBinaryOp(Value *V);
   };
 
-  const int Reassociate::ID = 0;
+  const char Reassociate::ID = 0;
   RegisterPass X("reassociate", "Reassociate expressions");
 }
 


Index: llvm/lib/Transforms/Scalar/Reg2Mem.cpp
diff -u llvm/lib/Transforms/Scalar/Reg2Mem.cpp:1.13 llvm/lib/Transforms/Scalar/Reg2Mem.cpp:1.14
--- llvm/lib/Transforms/Scalar/Reg2Mem.cpp:1.13	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Scalar/Reg2Mem.cpp	Wed May  2 16:39:19 2007
@@ -33,7 +33,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN RegToMem : public FunctionPass {
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     RegToMem() : FunctionPass((intptr_t)&ID) {}
 
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
@@ -78,7 +78,7 @@
     }
   };
   
-  const int RegToMem::ID = 0;
+  const char RegToMem::ID = 0;
   RegisterPass X("reg2mem", "Demote all values to stack slots");
 }
 


Index: llvm/lib/Transforms/Scalar/SCCP.cpp
diff -u llvm/lib/Transforms/Scalar/SCCP.cpp:1.166 llvm/lib/Transforms/Scalar/SCCP.cpp:1.167
--- llvm/lib/Transforms/Scalar/SCCP.cpp:1.166	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Scalar/SCCP.cpp	Wed May  2 16:39:19 2007
@@ -1334,7 +1334,7 @@
   /// Sparse Conditional Constant Propagator.
   ///
   struct VISIBILITY_HIDDEN SCCP : public FunctionPass {
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     SCCP() : FunctionPass((intptr_t)&ID) {}
 
     // runOnFunction - Run the Sparse Conditional Constant Propagation
@@ -1347,7 +1347,7 @@
     }
   };
 
-  const int SCCP::ID = 0;
+  const char SCCP::ID = 0;
   RegisterPass X("sccp", "Sparse Conditional Constant Propagation");
 } // end anonymous namespace
 
@@ -1447,12 +1447,12 @@
   /// Constant Propagation.
   ///
   struct VISIBILITY_HIDDEN IPSCCP : public ModulePass {
-    static const int ID;
+    static const char ID;
     IPSCCP() : ModulePass((intptr_t)&ID) {}
     bool runOnModule(Module &M);
   };
 
-  const int IPSCCP::ID = 0;
+  const char IPSCCP::ID = 0;
   RegisterPass
   Y("ipsccp", "Interprocedural Sparse Conditional Constant Propagation");
 } // end anonymous namespace


Index: llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp
diff -u llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp:1.91 llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp:1.92
--- llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp:1.91	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp	Wed May  2 16:39:19 2007
@@ -47,7 +47,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN SROA : public FunctionPass {
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     SROA() : FunctionPass((intptr_t)&ID) {}
 
     bool runOnFunction(Function &F);
@@ -84,7 +84,7 @@
     static Instruction *isOnlyCopiedFromConstantGlobal(AllocationInst *AI);
   };
 
-  const int SROA::ID = 0;
+  const char SROA::ID = 0;
   RegisterPass X("scalarrepl", "Scalar Replacement of Aggregates");
 }
 


Index: llvm/lib/Transforms/Scalar/SimplifyCFG.cpp
diff -u llvm/lib/Transforms/Scalar/SimplifyCFG.cpp:1.22 llvm/lib/Transforms/Scalar/SimplifyCFG.cpp:1.23
--- llvm/lib/Transforms/Scalar/SimplifyCFG.cpp:1.22	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Scalar/SimplifyCFG.cpp	Wed May  2 16:39:19 2007
@@ -35,12 +35,12 @@
 
 namespace {
   struct VISIBILITY_HIDDEN CFGSimplifyPass : public FunctionPass {
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     CFGSimplifyPass() : FunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnFunction(Function &F);
   };
-  const int CFGSimplifyPass::ID = 0;
+  const char CFGSimplifyPass::ID = 0;
   RegisterPass X("simplifycfg", "Simplify the CFG");
 }
 


Index: llvm/lib/Transforms/Scalar/TailDuplication.cpp
diff -u llvm/lib/Transforms/Scalar/TailDuplication.cpp:1.38 llvm/lib/Transforms/Scalar/TailDuplication.cpp:1.39
--- llvm/lib/Transforms/Scalar/TailDuplication.cpp:1.38	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Scalar/TailDuplication.cpp	Wed May  2 16:39:19 2007
@@ -43,14 +43,14 @@
   class VISIBILITY_HIDDEN TailDup : public FunctionPass {
     bool runOnFunction(Function &F);
   public:
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     TailDup() : FunctionPass((intptr_t)&ID) {}
 
   private:
     inline bool shouldEliminateUnconditionalBranch(TerminatorInst *TI);
     inline void eliminateUnconditionalBranch(BranchInst *BI);
   };
-  const int TailDup::ID = 0;
+  const char TailDup::ID = 0;
   RegisterPass X("tailduplicate", "Tail Duplication");
 }
 


Index: llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp
diff -u llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp:1.31 llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp:1.32
--- llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp:1.31	Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp	Wed May  2 16:39:19 2007
@@ -67,7 +67,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN TailCallElim : public FunctionPass {
-    static const int ID; // Pass identifcation, replacement for typeid
+    static const char ID; // Pass identifcation, replacement for typeid
     TailCallElim() : FunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnFunction(Function &F);
@@ -80,7 +80,7 @@
     bool CanMoveAboveCall(Instruction *I, CallInst *CI);
     Value *CanTransformAccumulatorRecursion(Instruction *I, CallInst *CI);
   };
-  const int TailCallElim::ID = 0;
+  const char TailCallElim::ID = 0;
   RegisterPass X("tailcallelim", "Tail Call Elimination");
 }
 





From isanbard at gmail.com  Wed May  2 16:42:42 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Wed, 2 May 2007 16:42:42 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/README-MMX.txt
Message-ID: <200705022142.l42Lgg3x024726@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

README-MMX.txt updated: 1.3 -> 1.4
---
Log message:

Update.


---
Diffs of the changes:  (+27 -0)

 README-MMX.txt |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+)


Index: llvm/lib/Target/X86/README-MMX.txt
diff -u llvm/lib/Target/X86/README-MMX.txt:1.3 llvm/lib/Target/X86/README-MMX.txt:1.4
--- llvm/lib/Target/X86/README-MMX.txt:1.3	Tue Apr 24 16:20:03 2007
+++ llvm/lib/Target/X86/README-MMX.txt	Wed May  2 16:42:20 2007
@@ -40,3 +40,30 @@
         movl    %edx, 4(%eax)
         addl    $12, %esp
         ret     $4
+
+//===---------------------------------------------------------------------===//
+
+int main() {
+  __m64 A[1] = { _mm_cvtsi32_si64(1)  };
+  __m64 B[1] = { _mm_cvtsi32_si64(10) };
+  __m64 sum = _mm_cvtsi32_si64(0);
+
+  sum = __builtin_ia32_paddq(__builtin_ia32_paddq(A[0], B[0]), sum);
+
+  printf("Sum = %d\n", _mm_cvtsi64_si32(sum));
+  return 0;
+}
+
+Generates:
+
+        movl $11, %eax
+###     movd %eax, %mm0
+###     movq %mm0, 8(%esp)
+###     movl 8(%esp), %eax
+        movl %eax, 4(%esp)
+        movl $_str, (%esp)
+        call L_printf$stub
+        xorl %eax, %eax
+        addl $28, %esp
+
+These instructions are unnecessary.





From lauro.venancio at gmail.com  Wed May  2 16:58:06 2007
From: lauro.venancio at gmail.com (Lauro Ramos Venancio)
Date: Wed, 2 May 2007 18:58:06 -0300
Subject: [llvm-commits] CVS:
	llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h
In-Reply-To: <200705022141.l42LfcDQ024624@zion.cs.uiuc.edu>
References: <200705022141.l42LfcDQ024624@zion.cs.uiuc.edu>
Message-ID: <9c10c9f0705021458h759a9732p5ea37063a7ad29a7@mail.gmail.com>

>
>
>
> 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.




 I think you should use 'static const signed char' because 'char' is signed
on X86 and unsigned on ARM.

Lauro
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20070502/90b67e65/attachment.html 

From dpatel at apple.com  Wed May  2 17:04:16 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 15:04:16 -0700
Subject: [llvm-commits] CVS:
	llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h
In-Reply-To: <9c10c9f0705021458h759a9732p5ea37063a7ad29a7@mail.gmail.com>
References: <200705022141.l42LfcDQ024624@zion.cs.uiuc.edu>
	<9c10c9f0705021458h759a9732p5ea37063a7ad29a7@mail.gmail.com>
Message-ID: <5962AAB1-9C30-49C8-89F7-29881C92714E@apple.com>


On May 2, 2007, at 2:58 PM, Lauro Ramos Venancio wrote:

>  I think you should use 'static const signed char' because 'char' is  
> signed on X86 and unsigned on ARM.

It does not matter. All I want is unique address of the static member  
to identify Pass.

-
Devang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20070502/620527ae/attachment.html 

From asl at math.spbu.ru  Wed May  2 17:16:07 2007
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 2 May 2007 17:16:07 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
Message-ID: <200705022216.l42MG7iV026123@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen/SelectionDAG:

SelectionDAGISel.cpp updated: 1.444 -> 1.445
---
Log message:

Properly set arguments bitwidth of EHSELECT node


---
Diffs of the changes:  (+2 -2)

 SelectionDAGISel.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.444 llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.445
--- llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.444	Wed May  2 16:39:19 2007
+++ llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp	Wed May  2 17:15:48 2007
@@ -2632,7 +2632,7 @@
       if (Reg) CurMBB->addLiveIn(Reg);
 
       // Insert the EHSELECTION instruction.
-      SDVTList VTs = DAG.getVTList(MVT::i32, MVT::Other);
+      SDVTList VTs = DAG.getVTList(TLI.getPointerTy(), MVT::Other);
       SDOperand Ops[2];
       Ops[0] = getValue(I.getOperand(1));
       Ops[1] = getRoot();
@@ -2640,7 +2640,7 @@
       setValue(&I, Op);
       DAG.setRoot(Op.getValue(1));
     } else {
-      setValue(&I, DAG.getConstant(0, MVT::i32));
+      setValue(&I, DAG.getConstant(0, TLI.getPointerTy()));
     }
     
     return 0;





From tonic at nondot.org  Wed May  2 17:16:32 2007
From: tonic at nondot.org (Tanya Lattner)
Date: Wed, 2 May 2007 17:16:32 -0500
Subject: [llvm-commits] CVS: nightlytest-serverside/NightlyTestAccept.php
Message-ID: <200705022216.l42MGWkk026185@zion.cs.uiuc.edu>



Changes in directory nightlytest-serverside:

NightlyTestAccept.php updated: 1.65 -> 1.66
---
Log message:

Die if no nickname is set!


---
Diffs of the changes:  (+6 -1)

 NightlyTestAccept.php |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)


Index: nightlytest-serverside/NightlyTestAccept.php
diff -u nightlytest-serverside/NightlyTestAccept.php:1.65 nightlytest-serverside/NightlyTestAccept.php:1.66
--- nightlytest-serverside/NightlyTestAccept.php:1.65	Sun Apr 29 16:10:32 2007
+++ nightlytest-serverside/NightlyTestAccept.php	Wed May  2 17:16:17 2007
@@ -466,7 +466,12 @@
  *
  *******************************************************************************/
 function acceptTest() {
-  
+ 
+  // If no nickname is set, die here
+  if (!isset($_POST['nickname'])) {
+    return;
+  }
+ 
   $database = "nightlytestresults";
   $loginname = "llvm";
   $password = "ll2002vm";





From isanbard at gmail.com  Wed May  2 18:12:12 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Wed, 2 May 2007 18:12:12 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86InstrSSE.td
Message-ID: <200705022312.l42NCC0c027441@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

X86InstrSSE.td updated: 1.181 -> 1.182
---
Log message:

Non-algorithmic change. Moved definitions around into separate sections
for SSE1, SSE2, SSE3, and SSSE3.


---
Diffs of the changes:  (+1266 -1019)

 X86InstrSSE.td | 2285 +++++++++++++++++++++++++++++++--------------------------
 1 files changed, 1266 insertions(+), 1019 deletions(-)


Index: llvm/lib/Target/X86/X86InstrSSE.td
diff -u llvm/lib/Target/X86/X86InstrSSE.td:1.181 llvm/lib/Target/X86/X86InstrSSE.td:1.182
--- llvm/lib/Target/X86/X86InstrSSE.td:1.181	Wed Apr 18 09:09:14 2007
+++ llvm/lib/Target/X86/X86InstrSSE.td	Wed May  2 18:11:52 2007
@@ -2,8 +2,8 @@
 // 
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by the Evan Cheng and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file was developed by Evan Cheng and is distributed under the University
+// of Illinois Open Source License. See LICENSE.TXT for details.
 // 
 //===----------------------------------------------------------------------===//
 //
@@ -41,6 +41,21 @@
 def X86pinsrw  : SDNode<"X86ISD::PINSRW", SDTypeProfile<1, 3, []>, []>;
 
 //===----------------------------------------------------------------------===//
+// SSE 'Special' Instructions
+//===----------------------------------------------------------------------===//
+
+def IMPLICIT_DEF_VR128 : I<0, Pseudo, (ops VR128:$dst),
+                           "#IMPLICIT_DEF $dst",
+                           [(set VR128:$dst, (v4f32 (undef)))]>,
+                         Requires<[HasSSE1]>;
+def IMPLICIT_DEF_FR32  : I<0, Pseudo, (ops FR32:$dst),
+                           "#IMPLICIT_DEF $dst",
+                           [(set FR32:$dst, (undef))]>, Requires<[HasSSE2]>;
+def IMPLICIT_DEF_FR64  : I<0, Pseudo, (ops FR64:$dst),
+                           "#IMPLICIT_DEF $dst",
+                           [(set FR64:$dst, (undef))]>, Requires<[HasSSE2]>;
+
+//===----------------------------------------------------------------------===//
 // SSE Complex Patterns
 //===----------------------------------------------------------------------===//
 
@@ -70,6 +85,7 @@
 
 def loadv4f32    : PatFrag<(ops node:$ptr), (v4f32 (load node:$ptr))>;
 def loadv2f64    : PatFrag<(ops node:$ptr), (v2f64 (load node:$ptr))>;
+def loadv2i32    : PatFrag<(ops node:$ptr), (v2i32 (load node:$ptr))>;
 def loadv2i64    : PatFrag<(ops node:$ptr), (v2i64 (load node:$ptr))>;
 
 def bc_v4f32 : PatFrag<(ops node:$in), (v4f32 (bitconvert node:$in))>;
@@ -182,106 +198,6 @@
 // SSE scalar FP Instructions
 //===----------------------------------------------------------------------===//
 
-// Instruction templates
-// SSI   - SSE1 instructions with XS prefix.
-// SDI   - SSE2 instructions with XD prefix.
-// PSI   - SSE1 instructions with TB prefix.
-// PDI   - SSE2 instructions with TB and OpSize prefixes.
-// PSIi8 - SSE1 instructions with ImmT == Imm8 and TB prefix.
-// PDIi8 - SSE2 instructions with ImmT == Imm8 and TB and OpSize prefixes.
-// S3I   - SSE3 instructions with TB and OpSize prefixes.
-// S3SI  - SSE3 instructions with XS prefix.
-// S3DI  - SSE3 instructions with XD prefix.
-// SS38I - SSSE3 instructions with T8 and OpSize prefixes.
-// SS3AI - SSSE3 instructions with TA and OpSize prefixes.
-class SSI o, Format F, dag ops, string asm, list pattern>
-      : I, XS, Requires<[HasSSE1]>;
-class SDI o, Format F, dag ops, string asm, list pattern>
-      : I, XD, Requires<[HasSSE2]>;
-class PSI o, Format F, dag ops, string asm, list pattern>
-      : I, TB, Requires<[HasSSE1]>;
-class PDI o, Format F, dag ops, string asm, list pattern>
-      : I, TB, OpSize, Requires<[HasSSE2]>;
-class PSIi8 o, Format F, dag ops, string asm, list pattern>
-      : Ii8, TB, Requires<[HasSSE1]>;
-class PDIi8 o, Format F, dag ops, string asm, list pattern>
-      : Ii8, TB, OpSize, Requires<[HasSSE2]>;
-
-class S3SI o, Format F, dag ops, string asm, list pattern>
-      : I, XS, Requires<[HasSSE3]>;
-class S3DI o, Format F, dag ops, string asm, list pattern>
-      : I, XD, Requires<[HasSSE3]>;
-class S3I o, Format F, dag ops, string asm, list pattern>
-      : I, TB, OpSize, Requires<[HasSSE3]>;
-
-class SS38I o, Format F, dag ops, string asm, list pattern>
-      : I, T8, OpSize, Requires<[HasSSSE3]>;
-class SS3AI o, Format F, dag ops, string asm, list pattern>
-      : I, TA, OpSize, Requires<[HasSSSE3]>;
-
-//===----------------------------------------------------------------------===//
-// Helpers for defining instructions that directly correspond to intrinsics.
-
-multiclass SS_IntUnary o, string OpcodeStr, Intrinsic IntId> {
-  def r : SSI;
-  def m : SSI;
-}
-
-multiclass SD_IntUnary o, string OpcodeStr, Intrinsic IntId> {
-  def r : SDI;
-  def m : SDI;
-}
-
-class PS_Intr o, string OpcodeStr, Intrinsic IntId>
-  : PSI;
-class PS_Intm o, string OpcodeStr, Intrinsic IntId>
-  : PSI;
-class PD_Intr o, string OpcodeStr, Intrinsic IntId>
-  : PDI;
-class PD_Intm o, string OpcodeStr, Intrinsic IntId>
-  : PDI;
-
-class PS_Intrr o, string OpcodeStr, Intrinsic IntId>
-  : PSI;
-class PS_Intrm o, string OpcodeStr, Intrinsic IntId>
-  : PSI;
-class PD_Intrr o, string OpcodeStr, Intrinsic IntId>
-  : PDI;
-class PD_Intrm o, string OpcodeStr, Intrinsic IntId>
-  : PDI;
-
-// Some 'special' instructions
-def IMPLICIT_DEF_FR32 : I<0, Pseudo, (ops FR32:$dst),
-                         "#IMPLICIT_DEF $dst",
-                         [(set FR32:$dst, (undef))]>, Requires<[HasSSE2]>;
-def IMPLICIT_DEF_FR64 : I<0, Pseudo, (ops FR64:$dst),
-                         "#IMPLICIT_DEF $dst",
-                         [(set FR64:$dst, (undef))]>, Requires<[HasSSE2]>;
-
 // CMOV* - Used to implement the SSE SELECT DAG operation.  Expanded by the
 // scheduler into a branch sequence.
 let usesCustomDAGSchedInserter = 1 in {  // Expanded by the scheduler.
@@ -310,28 +226,204 @@
                       (v2i64 (X86cmov VR128:$t, VR128:$f, imm:$cond)))]>;
 }
 
+//===----------------------------------------------------------------------===//
+// SSE1 Instructions
+//===----------------------------------------------------------------------===//
+
+// SSE1 Instruction Templates:
+// 
+//   SSI   - SSE1 instructions with XS prefix.
+//   PSI   - SSE1 instructions with TB prefix.
+//   PSIi8 - SSE1 instructions with ImmT == Imm8 and TB prefix.
+
+class SSI o, Format F, dag ops, string asm, list pattern>
+      : I, XS, Requires<[HasSSE1]>;
+class PSI o, Format F, dag ops, string asm, list pattern>
+      : I, TB, Requires<[HasSSE1]>;
+class PSIi8 o, Format F, dag ops, string asm, list pattern>
+      : Ii8, TB, Requires<[HasSSE1]>;
+
+// Helpers for defining instructions that directly correspond to intrinsics.
+multiclass SS_IntUnary o, string OpcodeStr, Intrinsic IntId> {
+  def r : SSI;
+  def m : SSI;
+}
+
 // Move Instructions
 def MOVSSrr : SSI<0x10, MRMSrcReg, (ops FR32:$dst, FR32:$src),
-                "movss {$src, $dst|$dst, $src}", []>;
+                  "movss {$src, $dst|$dst, $src}", []>;
 def MOVSSrm : SSI<0x10, MRMSrcMem, (ops FR32:$dst, f32mem:$src),
-                "movss {$src, $dst|$dst, $src}",
-                [(set FR32:$dst, (loadf32 addr:$src))]>;
-def MOVSDrr : SDI<0x10, MRMSrcReg, (ops FR64:$dst, FR64:$src),
-                "movsd {$src, $dst|$dst, $src}", []>;
-def MOVSDrm : SDI<0x10, MRMSrcMem, (ops FR64:$dst, f64mem:$src),
-                "movsd {$src, $dst|$dst, $src}",
-                [(set FR64:$dst, (loadf64 addr:$src))]>;
-
+                  "movss {$src, $dst|$dst, $src}",
+                  [(set FR32:$dst, (loadf32 addr:$src))]>;
 def MOVSSmr : SSI<0x11, MRMDestMem, (ops f32mem:$dst, FR32:$src),
-                "movss {$src, $dst|$dst, $src}",
-                [(store FR32:$src, addr:$dst)]>;
-def MOVSDmr : SDI<0x11, MRMDestMem, (ops f64mem:$dst, FR64:$src),
-                "movsd {$src, $dst|$dst, $src}",
-                [(store FR64:$src, addr:$dst)]>;
+                  "movss {$src, $dst|$dst, $src}",
+                  [(store FR32:$src, addr:$dst)]>;
 
-/// scalar_sse12_fp_binop_rm - Scalar SSE binops come in four basic forms:
-///  1. f32 vs f64 - These come in SSE1/SSE2 forms for float/doubles.
-///  2. rr vs rm - They include a reg+reg form and a ref+mem form.
+def SQRTSSr : SSI<0x51, MRMSrcReg, (ops FR32:$dst, FR32:$src),
+                  "sqrtss {$src, $dst|$dst, $src}",
+                  [(set FR32:$dst, (fsqrt FR32:$src))]>;
+def SQRTSSm : SSI<0x51, MRMSrcMem, (ops FR32:$dst, f32mem:$src),
+                  "sqrtss {$src, $dst|$dst, $src}",
+                  [(set FR32:$dst, (fsqrt (loadf32 addr:$src)))]>;
+
+// Aliases to match intrinsics which expect XMM operand(s).
+defm SQRTSS_Int  : SS_IntUnary<0x51, "sqrtss" , int_x86_sse_sqrt_ss>;
+defm RSQRTSS_Int : SS_IntUnary<0x52, "rsqrtss", int_x86_sse_rsqrt_ss>;
+defm RCPSS_Int   : SS_IntUnary<0x53, "rcpss"  , int_x86_sse_rcp_ss>;
+
+// Conversion instructions
+def CVTTSS2SIrr : SSI<0x2C, MRMSrcReg, (ops GR32:$dst, FR32:$src),
+                      "cvttss2si {$src, $dst|$dst, $src}",
+                      [(set GR32:$dst, (fp_to_sint FR32:$src))]>;
+def CVTTSS2SIrm : SSI<0x2C, MRMSrcMem, (ops GR32:$dst, f32mem:$src),
+                      "cvttss2si {$src, $dst|$dst, $src}",
+                      [(set GR32:$dst, (fp_to_sint (loadf32 addr:$src)))]>;
+def CVTSI2SSrr  : SSI<0x2A, MRMSrcReg, (ops FR32:$dst, GR32:$src),
+                      "cvtsi2ss {$src, $dst|$dst, $src}",
+                      [(set FR32:$dst, (sint_to_fp GR32:$src))]>;
+def CVTSI2SSrm  : SSI<0x2A, MRMSrcMem, (ops FR32:$dst, i32mem:$src),
+                      "cvtsi2ss {$src, $dst|$dst, $src}",
+                      [(set FR32:$dst, (sint_to_fp (loadi32 addr:$src)))]>;
+
+// Match intrinsics which expect XMM operand(s).
+def Int_CVTSS2SIrr : SSI<0x2D, MRMSrcReg, (ops GR32:$dst, VR128:$src),
+                         "cvtss2si {$src, $dst|$dst, $src}",
+                         [(set GR32:$dst, (int_x86_sse_cvtss2si VR128:$src))]>;
+def Int_CVTSS2SIrm : SSI<0x2D, MRMSrcMem, (ops GR32:$dst, f32mem:$src),
+                         "cvtss2si {$src, $dst|$dst, $src}",
+                         [(set GR32:$dst, (int_x86_sse_cvtss2si
+                                           (load addr:$src)))]>;
+
+// Aliases for intrinsics
+def Int_CVTTSS2SIrr : SSI<0x2C, MRMSrcReg, (ops GR32:$dst, VR128:$src),
+                          "cvttss2si {$src, $dst|$dst, $src}",
+                          [(set GR32:$dst,
+                            (int_x86_sse_cvttss2si VR128:$src))]>;
+def Int_CVTTSS2SIrm : SSI<0x2C, MRMSrcMem, (ops GR32:$dst, f32mem:$src),
+                          "cvttss2si {$src, $dst|$dst, $src}",
+                          [(set GR32:$dst,
+                            (int_x86_sse_cvttss2si(load addr:$src)))]>;
+
+let isTwoAddress = 1 in {
+  def Int_CVTSI2SSrr : SSI<0x2A, MRMSrcReg,
+                           (ops VR128:$dst, VR128:$src1, GR32:$src2),
+                           "cvtsi2ss {$src2, $dst|$dst, $src2}",
+                           [(set VR128:$dst, (int_x86_sse_cvtsi2ss VR128:$src1,
+                                              GR32:$src2))]>;
+  def Int_CVTSI2SSrm : SSI<0x2A, MRMSrcMem,
+                           (ops VR128:$dst, VR128:$src1, i32mem:$src2),
+                           "cvtsi2ss {$src2, $dst|$dst, $src2}",
+                           [(set VR128:$dst, (int_x86_sse_cvtsi2ss VR128:$src1,
+                                              (loadi32 addr:$src2)))]>;
+}
+
+// Comparison instructions
+let isTwoAddress = 1 in {
+  def CMPSSrr : SSI<0xC2, MRMSrcReg, 
+                    (ops FR32:$dst, FR32:$src1, FR32:$src, SSECC:$cc),
+                    "cmp${cc}ss {$src, $dst|$dst, $src}",
+                    []>;
+  def CMPSSrm : SSI<0xC2, MRMSrcMem, 
+                    (ops FR32:$dst, FR32:$src1, f32mem:$src, SSECC:$cc),
+                    "cmp${cc}ss {$src, $dst|$dst, $src}", []>;
+}
+
+def UCOMISSrr: PSI<0x2E, MRMSrcReg, (ops FR32:$src1, FR32:$src2),
+                   "ucomiss {$src2, $src1|$src1, $src2}",
+                   [(X86cmp FR32:$src1, FR32:$src2)]>;
+def UCOMISSrm: PSI<0x2E, MRMSrcMem, (ops FR32:$src1, f32mem:$src2),
+                   "ucomiss {$src2, $src1|$src1, $src2}",
+                   [(X86cmp FR32:$src1, (loadf32 addr:$src2))]>;
+
+// Aliases to match intrinsics which expect XMM operand(s).
+let isTwoAddress = 1 in {
+  def Int_CMPSSrr : SSI<0xC2, MRMSrcReg, 
+                        (ops VR128:$dst, VR128:$src1, VR128:$src, SSECC:$cc),
+                        "cmp${cc}ss {$src, $dst|$dst, $src}",
+                        [(set VR128:$dst, (int_x86_sse_cmp_ss VR128:$src1,
+                                           VR128:$src, imm:$cc))]>;
+  def Int_CMPSSrm : SSI<0xC2, MRMSrcMem, 
+                        (ops VR128:$dst, VR128:$src1, f32mem:$src, SSECC:$cc),
+                        "cmp${cc}ss {$src, $dst|$dst, $src}",
+                        [(set VR128:$dst, (int_x86_sse_cmp_ss VR128:$src1,
+                                           (load addr:$src), imm:$cc))]>;
+}
+
+def Int_UCOMISSrr: PSI<0x2E, MRMSrcReg, (ops VR128:$src1, VR128:$src2),
+                       "ucomiss {$src2, $src1|$src1, $src2}",
+                       [(X86ucomi (v4f32 VR128:$src1), VR128:$src2)]>;
+def Int_UCOMISSrm: PSI<0x2E, MRMSrcMem, (ops VR128:$src1, f128mem:$src2),
+                       "ucomiss {$src2, $src1|$src1, $src2}",
+                       [(X86ucomi (v4f32 VR128:$src1), (load addr:$src2))]>;
+
+def Int_COMISSrr: PSI<0x2F, MRMSrcReg, (ops VR128:$src1, VR128:$src2),
+                      "comiss {$src2, $src1|$src1, $src2}",
+                      [(X86comi (v4f32 VR128:$src1), VR128:$src2)]>;
+def Int_COMISSrm: PSI<0x2F, MRMSrcMem, (ops VR128:$src1, f128mem:$src2),
+                      "comiss {$src2, $src1|$src1, $src2}",
+                      [(X86comi (v4f32 VR128:$src1), (load addr:$src2))]>;
+
+// Aliases of packed SSE1 instructions for scalar use. These all have names that
+// start with 'Fs'.
+
+// Alias instructions that map fld0 to pxor for sse.
+def FsFLD0SS : I<0xEF, MRMInitReg, (ops FR32:$dst),
+                 "pxor $dst, $dst", [(set FR32:$dst, fp32imm0)]>,
+               Requires<[HasSSE1]>, TB, OpSize;
+
+// Alias instruction to do FR32 reg-to-reg copy using movaps. Upper bits are
+// disregarded.
+def FsMOVAPSrr : PSI<0x28, MRMSrcReg, (ops FR32:$dst, FR32:$src),
+                     "movaps {$src, $dst|$dst, $src}", []>;
+
+// Alias instruction to load FR32 from f128mem using movaps. Upper bits are
+// disregarded.
+def FsMOVAPSrm : PSI<0x28, MRMSrcMem, (ops FR32:$dst, f128mem:$src),
+                     "movaps {$src, $dst|$dst, $src}",
+                     [(set FR32:$dst, (X86loadpf32 addr:$src))]>;
+
+// Alias bitwise logical operations using SSE logical ops on packed FP values.
+let isTwoAddress = 1 in {
+
+let isCommutable = 1 in {
+  def FsANDPSrr : PSI<0x54, MRMSrcReg, (ops FR32:$dst, FR32:$src1, FR32:$src2),
+                      "andps {$src2, $dst|$dst, $src2}",
+                      [(set FR32:$dst, (X86fand FR32:$src1, FR32:$src2))]>;
+  def FsORPSrr  : PSI<0x56, MRMSrcReg, (ops FR32:$dst, FR32:$src1, FR32:$src2),
+                      "orps {$src2, $dst|$dst, $src2}",
+                      [(set FR32:$dst, (X86for FR32:$src1, FR32:$src2))]>;
+  def FsXORPSrr : PSI<0x57, MRMSrcReg, (ops FR32:$dst, FR32:$src1, FR32:$src2),
+                      "xorps {$src2, $dst|$dst, $src2}",
+                      [(set FR32:$dst, (X86fxor FR32:$src1, FR32:$src2))]>;
+}
+
+def FsANDPSrm : PSI<0x54, MRMSrcMem, (ops FR32:$dst, FR32:$src1, f128mem:$src2),
+                    "andps {$src2, $dst|$dst, $src2}",
+                    [(set FR32:$dst, (X86fand FR32:$src1,
+                                      (X86loadpf32 addr:$src2)))]>;
+def FsORPSrm  : PSI<0x56, MRMSrcMem, (ops FR32:$dst, FR32:$src1, f128mem:$src2),
+                    "orps {$src2, $dst|$dst, $src2}",
+                    [(set FR32:$dst, (X86for FR32:$src1,
+                                      (X86loadpf32 addr:$src2)))]>;
+def FsXORPSrm : PSI<0x57, MRMSrcMem, (ops FR32:$dst, FR32:$src1, f128mem:$src2),
+                    "xorps {$src2, $dst|$dst, $src2}",
+                    [(set FR32:$dst, (X86fxor FR32:$src1,
+                                      (X86loadpf32 addr:$src2)))]>;
+
+def FsANDNPSrr : PSI<0x55, MRMSrcReg, (ops FR32:$dst, FR32:$src1, FR32:$src2),
+                     "andnps {$src2, $dst|$dst, $src2}", []>;
+def FsANDNPSrm : PSI<0x55, MRMSrcMem, (ops FR32:$dst, FR32:$src1, f128mem:$src2),
+                     "andnps {$src2, $dst|$dst, $src2}", []>;
+}
+
+/// scalar_sse1_fp_binop_rm - Scalar SSE1 binops come in three basic forms:
+///  
+///  1. f32 - This comes in SSE1 form for floats.
+///  2. rr vs rm - They include a reg+reg form and a reg+mem form.
 ///
 /// In addition, scalar SSE ops have an intrinsic form.  This form is unlike the
 /// normal form, in that they take an entire vector (instead of a scalar) and
@@ -339,27 +431,20 @@
 /// above permutations, giving us 8 forms for 'instruction'.
 ///
 let isTwoAddress = 1 in {
-multiclass scalar_sse12_fp_binop_rm opc, string OpcodeStr,
-                                    SDNode OpNode, Intrinsic F32Int,
-                                    Intrinsic F64Int, bit Commutable = 0> {
+multiclass scalar_sse1_fp_binop_rm opc, string OpcodeStr,
+                                   SDNode OpNode, Intrinsic F32Int,
+                                   bit Commutable = 0> {
   // Scalar operation, reg+reg.
   def SSrr : SSI {
     let isCommutable = Commutable;
   }
-  def SDrr : SDI {
-    let isCommutable = Commutable;
-  }
+
   // Scalar operation, reg+mem.
   def SSrm : SSI;
-  def SDrm : SDI;
                  
   // Vector intrinsic operation, reg+reg.
   def SSrr_Int : SSI {
     let isCommutable = Commutable;
   }
-  def SDrr_Int : SDI {
-    let isCommutable = Commutable;
-  }
+
   // Vector intrinsic operation, reg+mem.
   def SSrm_Int : SSI;
-  def SDrm_Int : SDI;
 }
 }
 
 // Arithmetic instructions
+defm ADD : scalar_sse1_fp_binop_rm<0x58, "add", fadd, int_x86_sse_add_ss, 1>;
+defm MUL : scalar_sse1_fp_binop_rm<0x59, "mul", fmul, int_x86_sse_mul_ss, 1>;
+defm SUB : scalar_sse1_fp_binop_rm<0x5C, "sub", fsub, int_x86_sse_sub_ss>;
+defm DIV : scalar_sse1_fp_binop_rm<0x5E, "div", fdiv, int_x86_sse_div_ss>;
 
-defm ADD : scalar_sse12_fp_binop_rm<0x58, "add", fadd, 
-                                    int_x86_sse_add_ss, int_x86_sse2_add_sd, 1>;
-defm MUL : scalar_sse12_fp_binop_rm<0x59, "mul", fmul, 
-                                    int_x86_sse_mul_ss, int_x86_sse2_mul_sd, 1>;
-defm SUB : scalar_sse12_fp_binop_rm<0x5C, "sub", fsub,
-                                    int_x86_sse_sub_ss, int_x86_sse2_sub_sd>;
-defm DIV : scalar_sse12_fp_binop_rm<0x5E, "div", fdiv,
-                                    int_x86_sse_div_ss, int_x86_sse2_div_sd>;
-
-defm MAX : scalar_sse12_fp_binop_rm<0x5F, "max", X86fmax,
-                                    int_x86_sse_max_ss, int_x86_sse2_max_sd>;
-defm MIN : scalar_sse12_fp_binop_rm<0x5D, "min", X86fmin,
-                                    int_x86_sse_min_ss, int_x86_sse2_min_sd>;
+defm MAX : scalar_sse1_fp_binop_rm<0x5F, "max", X86fmax, int_x86_sse_max_ss>;
+defm MIN : scalar_sse1_fp_binop_rm<0x5D, "min", X86fmin, int_x86_sse_min_ss>;
 
+//===----------------------------------------------------------------------===//
+// SSE packed FP Instructions
+
+// Move Instructions
+def MOVAPSrr : PSI<0x28, MRMSrcReg, (ops VR128:$dst, VR128:$src),
+                   "movaps {$src, $dst|$dst, $src}", []>;
+def MOVAPSrm : PSI<0x28, MRMSrcMem, (ops VR128:$dst, f128mem:$src),
+                   "movaps {$src, $dst|$dst, $src}",
+                   [(set VR128:$dst, (loadv4f32 addr:$src))]>;
+
+def MOVAPSmr : PSI<0x29, MRMDestMem, (ops f128mem:$dst, VR128:$src),
+                   "movaps {$src, $dst|$dst, $src}",
+                   [(store (v4f32 VR128:$src), addr:$dst)]>;
+
+def MOVUPSrr : PSI<0x10, MRMSrcReg, (ops VR128:$dst, VR128:$src),
+                   "movups {$src, $dst|$dst, $src}", []>;
+def MOVUPSrm : PSI<0x10, MRMSrcMem, (ops VR128:$dst, f128mem:$src),
+                   "movups {$src, $dst|$dst, $src}",
+                   [(set VR128:$dst, (int_x86_sse_loadu_ps addr:$src))]>;
+def MOVUPSmr : PSI<0x11, MRMDestMem, (ops f128mem:$dst, VR128:$src),
+                   "movups {$src, $dst|$dst, $src}",
+                   [(int_x86_sse_storeu_ps addr:$dst, VR128:$src)]>;
+
+let isTwoAddress = 1 in {
+let AddedComplexity = 20 in {
+def MOVLPSrm : PSI<0x12, MRMSrcMem, (ops VR128:$dst, VR128:$src1, f64mem:$src2),
+                   "movlps {$src2, $dst|$dst, $src2}",
+                   [(set VR128:$dst, 
+                     (v4f32 (vector_shuffle VR128:$src1,
+                     (bc_v4f32 (v2f64 (scalar_to_vector (loadf64 addr:$src2)))),
+                             MOVLP_shuffle_mask)))]>;
+def MOVHPSrm : PSI<0x16, MRMSrcMem, (ops VR128:$dst, VR128:$src1, f64mem:$src2),
+                   "movhps {$src2, $dst|$dst, $src2}",
+                   [(set VR128:$dst, 
+                     (v4f32 (vector_shuffle VR128:$src1,
+                     (bc_v4f32 (v2f64 (scalar_to_vector (loadf64 addr:$src2)))),
+                             MOVHP_shuffle_mask)))]>;
+} // AddedComplexity
+} // isTwoAddress
+
+def MOVLPSmr : PSI<0x13, MRMDestMem, (ops f64mem:$dst, VR128:$src),
+                   "movlps {$src, $dst|$dst, $src}",
+                   [(store (f64 (vector_extract (bc_v2f64 (v4f32 VR128:$src)),
+                                 (iPTR 0))), addr:$dst)]>;
+
+// v2f64 extract element 1 is always custom lowered to unpack high to low
+// and extract element 0 so the non-store version isn't too horrible.
+def MOVHPSmr : PSI<0x17, MRMDestMem, (ops f64mem:$dst, VR128:$src),
+                   "movhps {$src, $dst|$dst, $src}",
+                   [(store (f64 (vector_extract
+                                 (v2f64 (vector_shuffle
+                                         (bc_v2f64 (v4f32 VR128:$src)), (undef),
+                                         UNPCKH_shuffle_mask)), (iPTR 0))),
+                     addr:$dst)]>;
+
+let isTwoAddress = 1 in {
+let AddedComplexity = 15 in {
+def MOVLHPSrr : PSI<0x16, MRMSrcReg, (ops VR128:$dst, VR128:$src1, VR128:$src2),
+                    "movlhps {$src2, $dst|$dst, $src2}",
+                    [(set VR128:$dst,
+                      (v4f32 (vector_shuffle VR128:$src1, VR128:$src2,
+                              MOVHP_shuffle_mask)))]>;
+
+def MOVHLPSrr : PSI<0x12, MRMSrcReg, (ops VR128:$dst, VR128:$src1, VR128:$src2),
+                    "movhlps {$src2, $dst|$dst, $src2}",
+                    [(set VR128:$dst,
+                      (v4f32 (vector_shuffle VR128:$src1, VR128:$src2,
+                              MOVHLPS_shuffle_mask)))]>;
+} // AddedComplexity
+} // isTwoAddress
+
+
+
+/// packed_sse1_fp_binop_rm - Packed SSE binops come in three basic forms:
+///  1. v4f32    - This comes in SSE1 form for float.
+///  2. rr vs rm - They include a reg+reg form and a ref+mem form.
+///
+let isTwoAddress = 1 in {
+multiclass packed_sse1_fp_binop_rm opc, string OpcodeStr,
+                                   SDNode OpNode, bit Commutable = 0> {
+  // Packed operation, reg+reg.
+  def PSrr : PSI {
+    let isCommutable = Commutable;
+  }
+
+  // Packed operation, reg+mem.
+  def PSrm : PSI;
+}
+}
+
+defm ADD : packed_sse1_fp_binop_rm<0x58, "add", fadd, 1>;
+defm MUL : packed_sse1_fp_binop_rm<0x59, "mul", fmul, 1>;
+defm DIV : packed_sse1_fp_binop_rm<0x5E, "div", fdiv>;
+defm SUB : packed_sse1_fp_binop_rm<0x5C, "sub", fsub>;
+
+// Arithmetic
+
+class PS_Intr o, string OpcodeStr, Intrinsic IntId>
+  : PSI;
+class PS_Intm o, string OpcodeStr, Intrinsic IntId>
+  : PSI;
+
+class PS_Intrr o, string OpcodeStr, Intrinsic IntId>
+  : PSI;
+class PS_Intrm o, string OpcodeStr, Intrinsic IntId>
+  : PSI;
+
+def SQRTPSr  : PS_Intr<0x51, "sqrtps", int_x86_sse_sqrt_ps>;
+def SQRTPSm  : PS_Intm<0x51, "sqrtps", int_x86_sse_sqrt_ps>;
+
+def RSQRTPSr : PS_Intr<0x52, "rsqrtps", int_x86_sse_rsqrt_ps>;
+def RSQRTPSm : PS_Intm<0x52, "rsqrtps", int_x86_sse_rsqrt_ps>;
+def RCPPSr   : PS_Intr<0x53, "rcpps", int_x86_sse_rcp_ps>;
+def RCPPSm   : PS_Intm<0x53, "rcpps", int_x86_sse_rcp_ps>;
+
+let isTwoAddress = 1 in {
+  let isCommutable = 1 in {
+    def MAXPSrr  : PS_Intrr<0x5F, "maxps", int_x86_sse_max_ps>;
+    def MINPSrr  : PS_Intrr<0x5D, "minps", int_x86_sse_min_ps>;
+  }
+
+  def MAXPSrm  : PS_Intrm<0x5F, "maxps", int_x86_sse_max_ps>;
+  def MINPSrm  : PS_Intrm<0x5D, "minps", int_x86_sse_min_ps>;
+}
+
+// Logical
+let isTwoAddress = 1 in {
+  let isCommutable = 1 in {
+    def ANDPSrr : PSI<0x54, MRMSrcReg,
+                      (ops VR128:$dst, VR128:$src1, VR128:$src2),
+                      "andps {$src2, $dst|$dst, $src2}",
+                      [(set VR128:$dst, (v2i64
+                                         (and VR128:$src1, VR128:$src2)))]>;
+    def ORPSrr  : PSI<0x56, MRMSrcReg,
+                      (ops VR128:$dst, VR128:$src1, VR128:$src2),
+                      "orps {$src2, $dst|$dst, $src2}",
+                      [(set VR128:$dst, (v2i64
+                                         (or VR128:$src1, VR128:$src2)))]>;
+    def XORPSrr : PSI<0x57, MRMSrcReg,
+                      (ops VR128:$dst, VR128:$src1, VR128:$src2),
+                      "xorps {$src2, $dst|$dst, $src2}",
+                      [(set VR128:$dst, (v2i64
+                                         (xor VR128:$src1, VR128:$src2)))]>;
+  }
+
+  def ANDPSrm : PSI<0x54, MRMSrcMem,
+                    (ops VR128:$dst, VR128:$src1, f128mem:$src2),
+                    "andps {$src2, $dst|$dst, $src2}",
+                    [(set VR128:$dst, (and VR128:$src1,
+                                       (bc_v2i64 (loadv4f32 addr:$src2))))]>;
+  def ORPSrm  : PSI<0x56, MRMSrcMem,
+                    (ops VR128:$dst, VR128:$src1, f128mem:$src2),
+                    "orps {$src2, $dst|$dst, $src2}",
+                    [(set VR128:$dst, (or VR128:$src1,
+                                       (bc_v2i64 (loadv4f32 addr:$src2))))]>;
+  def XORPSrm : PSI<0x57, MRMSrcMem,
+                    (ops VR128:$dst, VR128:$src1, f128mem:$src2),
+                    "xorps {$src2, $dst|$dst, $src2}",
+                    [(set VR128:$dst, (xor VR128:$src1,
+                                       (bc_v2i64 (loadv4f32 addr:$src2))))]>;
+  def ANDNPSrr : PSI<0x55, MRMSrcReg,
+                     (ops VR128:$dst, VR128:$src1, VR128:$src2),
+                     "andnps {$src2, $dst|$dst, $src2}",
+                     [(set VR128:$dst,
+                       (v2i64 (and (xor VR128:$src1,
+                                    (bc_v2i64 (v4i32 immAllOnesV))),
+                               VR128:$src2)))]>;
+  def ANDNPSrm : PSI<0x55, MRMSrcMem,
+                     (ops VR128:$dst, VR128:$src1,f128mem:$src2),
+                     "andnps {$src2, $dst|$dst, $src2}",
+                     [(set VR128:$dst,
+                       (v2i64 (and (xor VR128:$src1,
+                                    (bc_v2i64 (v4i32 immAllOnesV))),
+                               (bc_v2i64 (loadv4f32 addr:$src2)))))]>;
+}
+
+let isTwoAddress = 1 in {
+  def CMPPSrri : PSIi8<0xC2, MRMSrcReg, 
+                      (ops VR128:$dst, VR128:$src1, VR128:$src, SSECC:$cc),
+                      "cmp${cc}ps {$src, $dst|$dst, $src}",
+                      [(set VR128:$dst, (int_x86_sse_cmp_ps VR128:$src1,
+                                         VR128:$src, imm:$cc))]>;
+  def CMPPSrmi : PSIi8<0xC2, MRMSrcMem, 
+                      (ops VR128:$dst, VR128:$src1, f128mem:$src, SSECC:$cc),
+                      "cmp${cc}ps {$src, $dst|$dst, $src}",
+                      [(set VR128:$dst, (int_x86_sse_cmp_ps VR128:$src1,
+                                         (load addr:$src), imm:$cc))]>;
+}
+
+// Shuffle and unpack instructions
+let isTwoAddress = 1 in {
+  let isConvertibleToThreeAddress = 1 in // Convert to pshufd
+    def SHUFPSrri : PSIi8<0xC6, MRMSrcReg, 
+                          (ops VR128:$dst, VR128:$src1,
+                           VR128:$src2, i32i8imm:$src3),
+                          "shufps {$src3, $src2, $dst|$dst, $src2, $src3}",
+                          [(set VR128:$dst,
+                            (v4f32 (vector_shuffle
+                                    VR128:$src1, VR128:$src2,
+                                    SHUFP_shuffle_mask:$src3)))]>;
+  def SHUFPSrmi : PSIi8<0xC6, MRMSrcMem, 
+                        (ops VR128:$dst, VR128:$src1,
+                         f128mem:$src2, i32i8imm:$src3),
+                        "shufps {$src3, $src2, $dst|$dst, $src2, $src3}",
+                        [(set VR128:$dst,
+                          (v4f32 (vector_shuffle
+                                  VR128:$src1, (load addr:$src2),
+                                  SHUFP_shuffle_mask:$src3)))]>;
+
+  let AddedComplexity = 10 in {
+    def UNPCKHPSrr : PSI<0x15, MRMSrcReg, 
+                         (ops VR128:$dst, VR128:$src1, VR128:$src2),
+                         "unpckhps {$src2, $dst|$dst, $src2}",
+                         [(set VR128:$dst,
+                           (v4f32 (vector_shuffle
+                                   VR128:$src1, VR128:$src2,
+                                   UNPCKH_shuffle_mask)))]>;
+    def UNPCKHPSrm : PSI<0x15, MRMSrcMem, 
+                         (ops VR128:$dst, VR128:$src1, f128mem:$src2),
+                         "unpckhps {$src2, $dst|$dst, $src2}",
+                         [(set VR128:$dst,
+                           (v4f32 (vector_shuffle
+                                   VR128:$src1, (load addr:$src2),
+                                   UNPCKH_shuffle_mask)))]>;
+
+    def UNPCKLPSrr : PSI<0x14, MRMSrcReg, 
+                         (ops VR128:$dst, VR128:$src1, VR128:$src2),
+                         "unpcklps {$src2, $dst|$dst, $src2}",
+                         [(set VR128:$dst,
+                           (v4f32 (vector_shuffle
+                                   VR128:$src1, VR128:$src2,
+                                   UNPCKL_shuffle_mask)))]>;
+    def UNPCKLPSrm : PSI<0x14, MRMSrcMem, 
+                         (ops VR128:$dst, VR128:$src1, f128mem:$src2),
+                         "unpcklps {$src2, $dst|$dst, $src2}",
+                         [(set VR128:$dst,
+                           (v4f32 (vector_shuffle
+                                   VR128:$src1, (load addr:$src2),
+                                   UNPCKL_shuffle_mask)))]>;
+  } // AddedComplexity
+} // isTwoAddress
+
+// Mask creation
+def MOVMSKPSrr : PSI<0x50, MRMSrcReg, (ops GR32:$dst, VR128:$src),
+                     "movmskps {$src, $dst|$dst, $src}",
+                     [(set GR32:$dst, (int_x86_sse_movmsk_ps VR128:$src))]>;
+def MOVMSKPDrr : PSI<0x50, MRMSrcReg, (ops GR32:$dst, VR128:$src),
+                     "movmskpd {$src, $dst|$dst, $src}",
+                     [(set GR32:$dst, (int_x86_sse2_movmsk_pd VR128:$src))]>;
+
+// Prefetching loads.
+// TODO: no intrinsics for these?
+def PREFETCHT0   : PSI<0x18, MRM1m, (ops i8mem:$src), "prefetcht0 $src", []>;
+def PREFETCHT1   : PSI<0x18, MRM2m, (ops i8mem:$src), "prefetcht1 $src", []>;
+def PREFETCHT2   : PSI<0x18, MRM3m, (ops i8mem:$src), "prefetcht2 $src", []>;
+def PREFETCHNTA  : PSI<0x18, MRM0m, (ops i8mem:$src), "prefetchnta $src", []>;
+
+// Non-temporal stores
+def MOVNTPSmr : PSI<0x2B, MRMDestMem, (ops i128mem:$dst, VR128:$src),
+                    "movntps {$src, $dst|$dst, $src}",
+                    [(int_x86_sse_movnt_ps addr:$dst, VR128:$src)]>;
+
+// Load, store, and memory fence
+def SFENCE : PSI<0xAE, MRM7m, (ops), "sfence", [(int_x86_sse_sfence)]>;
+
+// MXCSR register
+def LDMXCSR : PSI<0xAE, MRM2m, (ops i32mem:$src),
+                  "ldmxcsr $src", [(int_x86_sse_ldmxcsr addr:$src)]>;
+def STMXCSR : PSI<0xAE, MRM3m, (ops i32mem:$dst),
+                  "stmxcsr $dst", [(int_x86_sse_stmxcsr addr:$dst)]>;
+
+// Alias instructions that map zero vector to pxor / xorp* for sse.
+// FIXME: remove when we can teach regalloc that xor reg, reg is ok.
+let isReMaterializable = 1 in
+def V_SET0 : PSI<0x57, MRMInitReg, (ops VR128:$dst),
+                 "xorps $dst, $dst",
+                 [(set VR128:$dst, (v4f32 immAllZerosV))]>;
+
+// FR32 to 128-bit vector conversion.
+def MOVSS2PSrr : SSI<0x10, MRMSrcReg, (ops VR128:$dst, FR32:$src),
+                      "movss {$src, $dst|$dst, $src}",
+                      [(set VR128:$dst,
+                        (v4f32 (scalar_to_vector FR32:$src)))]>;
+def MOVSS2PSrm : SSI<0x10, MRMSrcMem, (ops VR128:$dst, f32mem:$src),
+                     "movss {$src, $dst|$dst, $src}",
+                     [(set VR128:$dst,
+                       (v4f32 (scalar_to_vector (loadf32 addr:$src))))]>;
+
+// FIXME: may not be able to eliminate this movss with coalescing the src and
+// dest register classes are different. We really want to write this pattern
+// like this:
+// def : Pat<(f32 (vector_extract (v4f32 VR128:$src), (iPTR 0))),
+//           (f32 FR32:$src)>;
+def MOVPS2SSrr : SSI<0x10, MRMSrcReg, (ops FR32:$dst, VR128:$src),
+                     "movss {$src, $dst|$dst, $src}",
+                     [(set FR32:$dst, (vector_extract (v4f32 VR128:$src),
+                                       (iPTR 0)))]>;
+def MOVPS2SSmr : SSI<0x11, MRMDestMem, (ops f32mem:$dst, VR128:$src),
+                     "movss {$src, $dst|$dst, $src}",
+                     [(store (f32 (vector_extract (v4f32 VR128:$src),
+                                   (iPTR 0))), addr:$dst)]>;
+
+
+// Move to lower bits of a VR128, leaving upper bits alone.
+// Three operand (but two address) aliases.
+let isTwoAddress = 1 in {
+  def MOVLSS2PSrr : SSI<0x10, MRMSrcReg,
+                        (ops VR128:$dst, VR128:$src1, FR32:$src2),
+                        "movss {$src2, $dst|$dst, $src2}", []>;
+
+  let AddedComplexity = 15 in
+    def MOVLPSrr : SSI<0x10, MRMSrcReg,
+                       (ops VR128:$dst, VR128:$src1, VR128:$src2),
+                       "movss {$src2, $dst|$dst, $src2}",
+                       [(set VR128:$dst,
+                         (v4f32 (vector_shuffle VR128:$src1, VR128:$src2,
+                                 MOVL_shuffle_mask)))]>;
+}
+
+// Move to lower bits of a VR128 and zeroing upper bits.
+// Loading from memory automatically zeroing upper bits.
+let AddedComplexity = 20 in
+def MOVZSS2PSrm : SSI<0x10, MRMSrcMem, (ops VR128:$dst, f32mem:$src),
+                      "movss {$src, $dst|$dst, $src}",
+                      [(set VR128:$dst, (v4f32 (vector_shuffle immAllZerosV,
+                                 (v4f32 (scalar_to_vector (loadf32 addr:$src))),
+                                                MOVL_shuffle_mask)))]>;
+
+
+//===----------------------------------------------------------------------===//
+// SSE2 Instructions
+//===----------------------------------------------------------------------===//
+
+// SSE2 Instruction Templates:
+// 
+//   SDI   - SSE2 instructions with XD prefix.
+//   PDI   - SSE2 instructions with TB and OpSize prefixes.
+//   PDIi8 - SSE2 instructions with ImmT == Imm8 and TB and OpSize prefixes.
+
+class SDI o, Format F, dag ops, string asm, list pattern>
+      : I, XD, Requires<[HasSSE2]>;
+class PDI o, Format F, dag ops, string asm, list pattern>
+      : I, TB, OpSize, Requires<[HasSSE2]>;
+class PDIi8 o, Format F, dag ops, string asm, list pattern>
+      : Ii8, TB, OpSize, Requires<[HasSSE2]>;
+
+// Helpers for defining instructions that directly correspond to intrinsics.
+multiclass SD_IntUnary o, string OpcodeStr, Intrinsic IntId> {
+  def r : SDI;
+  def m : SDI;
+}
+
+// Move Instructions
+def MOVSDrr : SDI<0x10, MRMSrcReg, (ops FR64:$dst, FR64:$src),
+                  "movsd {$src, $dst|$dst, $src}", []>;
+def MOVSDrm : SDI<0x10, MRMSrcMem, (ops FR64:$dst, f64mem:$src),
+                  "movsd {$src, $dst|$dst, $src}",
+                  [(set FR64:$dst, (loadf64 addr:$src))]>;
+def MOVSDmr : SDI<0x11, MRMDestMem, (ops f64mem:$dst, FR64:$src),
+                  "movsd {$src, $dst|$dst, $src}",
+                  [(store FR64:$src, addr:$dst)]>;
 
-def SQRTSSr : SSI<0x51, MRMSrcReg, (ops FR32:$dst, FR32:$src),
-                "sqrtss {$src, $dst|$dst, $src}",
-                [(set FR32:$dst, (fsqrt FR32:$src))]>;
-def SQRTSSm : SSI<0x51, MRMSrcMem, (ops FR32:$dst, f32mem:$src),
-                 "sqrtss {$src, $dst|$dst, $src}",
-                 [(set FR32:$dst, (fsqrt (loadf32 addr:$src)))]>;
 def SQRTSDr : SDI<0x51, MRMSrcReg, (ops FR64:$dst, FR64:$src),
-                 "sqrtsd {$src, $dst|$dst, $src}",
-                 [(set FR64:$dst, (fsqrt FR64:$src))]>;
+                  "sqrtsd {$src, $dst|$dst, $src}",
+                  [(set FR64:$dst, (fsqrt FR64:$src))]>;
 def SQRTSDm : SDI<0x51, MRMSrcMem, (ops FR64:$dst, f64mem:$src),
-                 "sqrtsd {$src, $dst|$dst, $src}",
-                 [(set FR64:$dst, (fsqrt (loadf64 addr:$src)))]>;
+                  "sqrtsd {$src, $dst|$dst, $src}",
+                  [(set FR64:$dst, (fsqrt (loadf64 addr:$src)))]>;
 
 // Aliases to match intrinsics which expect XMM operand(s).
-
-defm SQRTSS_Int  : SS_IntUnary<0x51, "sqrtss" , int_x86_sse_sqrt_ss>;
-defm SQRTSD_Int  : SD_IntUnary<0x51, "sqrtsd" , int_x86_sse2_sqrt_sd>;
-defm RSQRTSS_Int : SS_IntUnary<0x52, "rsqrtss", int_x86_sse_rsqrt_ss>;
-defm RCPSS_Int   : SS_IntUnary<0x53, "rcpss"  , int_x86_sse_rcp_ss>;
+defm SQRTSD_Int : SD_IntUnary<0x51, "sqrtsd" , int_x86_sse2_sqrt_sd>;
 
 // Conversion instructions
-def CVTTSS2SIrr: SSI<0x2C, MRMSrcReg, (ops GR32:$dst, FR32:$src),
-                    "cvttss2si {$src, $dst|$dst, $src}",
-                    [(set GR32:$dst, (fp_to_sint FR32:$src))]>;
-def CVTTSS2SIrm: SSI<0x2C, MRMSrcMem, (ops GR32:$dst, f32mem:$src),
-                    "cvttss2si {$src, $dst|$dst, $src}",
-                    [(set GR32:$dst, (fp_to_sint (loadf32 addr:$src)))]>;
-def CVTTSD2SIrr: SDI<0x2C, MRMSrcReg, (ops GR32:$dst, FR64:$src),
-                    "cvttsd2si {$src, $dst|$dst, $src}",
-                    [(set GR32:$dst, (fp_to_sint FR64:$src))]>;
-def CVTTSD2SIrm: SDI<0x2C, MRMSrcMem, (ops GR32:$dst, f64mem:$src),
-                    "cvttsd2si {$src, $dst|$dst, $src}",
-                    [(set GR32:$dst, (fp_to_sint (loadf64 addr:$src)))]>;
-def CVTSD2SSrr: SDI<0x5A, MRMSrcReg, (ops FR32:$dst, FR64:$src),
-                   "cvtsd2ss {$src, $dst|$dst, $src}",
-                   [(set FR32:$dst, (fround FR64:$src))]>;
-def CVTSD2SSrm: SDI<0x5A, MRMSrcMem, (ops FR32:$dst, f64mem:$src), 
-                   "cvtsd2ss {$src, $dst|$dst, $src}",
-                   [(set FR32:$dst, (fround (loadf64 addr:$src)))]>;
-def CVTSI2SSrr: SSI<0x2A, MRMSrcReg, (ops FR32:$dst, GR32:$src),
-                  "cvtsi2ss {$src, $dst|$dst, $src}",
-                  [(set FR32:$dst, (sint_to_fp GR32:$src))]>;
-def CVTSI2SSrm: SSI<0x2A, MRMSrcMem, (ops FR32:$dst, i32mem:$src),
-                   "cvtsi2ss {$src, $dst|$dst, $src}",
-                   [(set FR32:$dst, (sint_to_fp (loadi32 addr:$src)))]>;
-def CVTSI2SDrr: SDI<0x2A, MRMSrcReg, (ops FR64:$dst, GR32:$src),
-                   "cvtsi2sd {$src, $dst|$dst, $src}",
-                   [(set FR64:$dst, (sint_to_fp GR32:$src))]>;
-def CVTSI2SDrm: SDI<0x2A, MRMSrcMem, (ops FR64:$dst, i32mem:$src),
-                   "cvtsi2sd {$src, $dst|$dst, $src}",
-                   [(set FR64:$dst, (sint_to_fp (loadi32 addr:$src)))]>;
+def CVTTSD2SIrr : SDI<0x2C, MRMSrcReg, (ops GR32:$dst, FR64:$src),
+                      "cvttsd2si {$src, $dst|$dst, $src}",
+                      [(set GR32:$dst, (fp_to_sint FR64:$src))]>;
+def CVTTSD2SIrm : SDI<0x2C, MRMSrcMem, (ops GR32:$dst, f64mem:$src),
+                      "cvttsd2si {$src, $dst|$dst, $src}",
+                      [(set GR32:$dst, (fp_to_sint (loadf64 addr:$src)))]>;
+def CVTSD2SSrr  : SDI<0x5A, MRMSrcReg, (ops FR32:$dst, FR64:$src),
+                      "cvtsd2ss {$src, $dst|$dst, $src}",
+                      [(set FR32:$dst, (fround FR64:$src))]>;
+def CVTSD2SSrm  : SDI<0x5A, MRMSrcMem, (ops FR32:$dst, f64mem:$src), 
+                      "cvtsd2ss {$src, $dst|$dst, $src}",
+                      [(set FR32:$dst, (fround (loadf64 addr:$src)))]>;
+def CVTSI2SDrr  : SDI<0x2A, MRMSrcReg, (ops FR64:$dst, GR32:$src),
+                      "cvtsi2sd {$src, $dst|$dst, $src}",
+                      [(set FR64:$dst, (sint_to_fp GR32:$src))]>;
+def CVTSI2SDrm  : SDI<0x2A, MRMSrcMem, (ops FR64:$dst, i32mem:$src),
+                      "cvtsi2sd {$src, $dst|$dst, $src}",
+                      [(set FR64:$dst, (sint_to_fp (loadi32 addr:$src)))]>;
 
 // SSE2 instructions with XS prefix
-def CVTSS2SDrr: I<0x5A, MRMSrcReg, (ops FR64:$dst, FR32:$src),
-                 "cvtss2sd {$src, $dst|$dst, $src}",
-                 [(set FR64:$dst, (fextend FR32:$src))]>, XS,
-                Requires<[HasSSE2]>;
-def CVTSS2SDrm: I<0x5A, MRMSrcMem, (ops FR64:$dst, f32mem:$src),
-                 "cvtss2sd {$src, $dst|$dst, $src}",
-                 [(set FR64:$dst, (extloadf32 addr:$src))]>, XS,
-                Requires<[HasSSE2]>;
+def CVTSS2SDrr : I<0x5A, MRMSrcReg, (ops FR64:$dst, FR32:$src),
+                   "cvtss2sd {$src, $dst|$dst, $src}",
+                   [(set FR64:$dst, (fextend FR32:$src))]>, XS,
+                 Requires<[HasSSE2]>;
+def CVTSS2SDrm : I<0x5A, MRMSrcMem, (ops FR64:$dst, f32mem:$src),
+                   "cvtss2sd {$src, $dst|$dst, $src}",
+                   [(set FR64:$dst, (extloadf32 addr:$src))]>, XS,
+                 Requires<[HasSSE2]>;
 
 // Match intrinsics which expect XMM operand(s).
-def Int_CVTSS2SIrr: SSI<0x2D, MRMSrcReg, (ops GR32:$dst, VR128:$src),
-                        "cvtss2si {$src, $dst|$dst, $src}",
-                        [(set GR32:$dst, (int_x86_sse_cvtss2si VR128:$src))]>;
-def Int_CVTSS2SIrm: SSI<0x2D, MRMSrcMem, (ops GR32:$dst, f32mem:$src),
-                        "cvtss2si {$src, $dst|$dst, $src}",
-                        [(set GR32:$dst, (int_x86_sse_cvtss2si
-                                          (load addr:$src)))]>;
-def Int_CVTSD2SIrr: SDI<0x2D, MRMSrcReg, (ops GR32:$dst, VR128:$src),
-                        "cvtsd2si {$src, $dst|$dst, $src}",
-                        [(set GR32:$dst, (int_x86_sse2_cvtsd2si VR128:$src))]>;
-def Int_CVTSD2SIrm: SDI<0x2D, MRMSrcMem, (ops GR32:$dst, f128mem:$src),
-                        "cvtsd2si {$src, $dst|$dst, $src}",
-                        [(set GR32:$dst, (int_x86_sse2_cvtsd2si
-                                          (load addr:$src)))]>;
+def Int_CVTSD2SIrr : SDI<0x2D, MRMSrcReg, (ops GR32:$dst, VR128:$src),
+                         "cvtsd2si {$src, $dst|$dst, $src}",
+                         [(set GR32:$dst, (int_x86_sse2_cvtsd2si VR128:$src))]>;
+def Int_CVTSD2SIrm : SDI<0x2D, MRMSrcMem, (ops GR32:$dst, f128mem:$src),
+                         "cvtsd2si {$src, $dst|$dst, $src}",
+                         [(set GR32:$dst, (int_x86_sse2_cvtsd2si
+                                           (load addr:$src)))]>;
 
 // Aliases for intrinsics
-def Int_CVTTSS2SIrr: SSI<0x2C, MRMSrcReg, (ops GR32:$dst, VR128:$src),
-                    "cvttss2si {$src, $dst|$dst, $src}",
-                    [(set GR32:$dst, (int_x86_sse_cvttss2si VR128:$src))]>;
-def Int_CVTTSS2SIrm: SSI<0x2C, MRMSrcMem, (ops GR32:$dst, f32mem:$src),
-                    "cvttss2si {$src, $dst|$dst, $src}",
-                    [(set GR32:$dst, (int_x86_sse_cvttss2si(load addr:$src)))]>;
-def Int_CVTTSD2SIrr: SDI<0x2C, MRMSrcReg, (ops GR32:$dst, VR128:$src),
-                         "cvttsd2si {$src, $dst|$dst, $src}",
-                         [(set GR32:$dst, (int_x86_sse2_cvttsd2si VR128:$src))]>;
-def Int_CVTTSD2SIrm: SDI<0x2C, MRMSrcMem, (ops GR32:$dst, f128mem:$src),
-                         "cvttsd2si {$src, $dst|$dst, $src}",
-                         [(set GR32:$dst, (int_x86_sse2_cvttsd2si
-                                          (load addr:$src)))]>;
-
-let isTwoAddress = 1 in {
-def Int_CVTSI2SSrr: SSI<0x2A, MRMSrcReg,
-                        (ops VR128:$dst, VR128:$src1, GR32:$src2),
-                        "cvtsi2ss {$src2, $dst|$dst, $src2}",
-                        [(set VR128:$dst, (int_x86_sse_cvtsi2ss VR128:$src1,
-                                           GR32:$src2))]>;
-def Int_CVTSI2SSrm: SSI<0x2A, MRMSrcMem,
-                        (ops VR128:$dst, VR128:$src1, i32mem:$src2),
-                        "cvtsi2ss {$src2, $dst|$dst, $src2}",
-                        [(set VR128:$dst, (int_x86_sse_cvtsi2ss VR128:$src1,
-                                           (loadi32 addr:$src2)))]>;
-}
+def Int_CVTTSD2SIrr : SDI<0x2C, MRMSrcReg, (ops GR32:$dst, VR128:$src),
+                          "cvttsd2si {$src, $dst|$dst, $src}",
+                          [(set GR32:$dst,
+                            (int_x86_sse2_cvttsd2si VR128:$src))]>;
+def Int_CVTTSD2SIrm : SDI<0x2C, MRMSrcMem, (ops GR32:$dst, f128mem:$src),
+                          "cvttsd2si {$src, $dst|$dst, $src}",
+                          [(set GR32:$dst, (int_x86_sse2_cvttsd2si
+                                            (load addr:$src)))]>;
 
 // Comparison instructions
 let isTwoAddress = 1 in {
-def CMPSSrr : SSI<0xC2, MRMSrcReg, 
-                (ops FR32:$dst, FR32:$src1, FR32:$src, SSECC:$cc),
-                "cmp${cc}ss {$src, $dst|$dst, $src}",
-                 []>;
-def CMPSSrm : SSI<0xC2, MRMSrcMem, 
-                (ops FR32:$dst, FR32:$src1, f32mem:$src, SSECC:$cc),
-                "cmp${cc}ss {$src, $dst|$dst, $src}", []>;
-def CMPSDrr : SDI<0xC2, MRMSrcReg, 
-                (ops FR64:$dst, FR64:$src1, FR64:$src, SSECC:$cc),
-                "cmp${cc}sd {$src, $dst|$dst, $src}", []>;
-def CMPSDrm : SDI<0xC2, MRMSrcMem, 
-                (ops FR64:$dst, FR64:$src1, f64mem:$src, SSECC:$cc),
-                "cmp${cc}sd {$src, $dst|$dst, $src}", []>;
+  def CMPSDrr : SDI<0xC2, MRMSrcReg, 
+                    (ops FR64:$dst, FR64:$src1, FR64:$src, SSECC:$cc),
+                    "cmp${cc}sd {$src, $dst|$dst, $src}", []>;
+  def CMPSDrm : SDI<0xC2, MRMSrcMem, 
+                    (ops FR64:$dst, FR64:$src1, f64mem:$src, SSECC:$cc),
+                    "cmp${cc}sd {$src, $dst|$dst, $src}", []>;
 }
 
-def UCOMISSrr: PSI<0x2E, MRMSrcReg, (ops FR32:$src1, FR32:$src2),
-                 "ucomiss {$src2, $src1|$src1, $src2}",
-                 [(X86cmp FR32:$src1, FR32:$src2)]>;
-def UCOMISSrm: PSI<0x2E, MRMSrcMem, (ops FR32:$src1, f32mem:$src2),
-                 "ucomiss {$src2, $src1|$src1, $src2}",
-                 [(X86cmp FR32:$src1, (loadf32 addr:$src2))]>;
 def UCOMISDrr: PDI<0x2E, MRMSrcReg, (ops FR64:$src1, FR64:$src2),
-                 "ucomisd {$src2, $src1|$src1, $src2}",
-                 [(X86cmp FR64:$src1, FR64:$src2)]>;
+                   "ucomisd {$src2, $src1|$src1, $src2}",
+                   [(X86cmp FR64:$src1, FR64:$src2)]>;
 def UCOMISDrm: PDI<0x2E, MRMSrcMem, (ops FR64:$src1, f64mem:$src2),
-                 "ucomisd {$src2, $src1|$src1, $src2}",
-                 [(X86cmp FR64:$src1, (loadf64 addr:$src2))]>;
+                   "ucomisd {$src2, $src1|$src1, $src2}",
+                   [(X86cmp FR64:$src1, (loadf64 addr:$src2))]>;
 
 // Aliases to match intrinsics which expect XMM operand(s).
 let isTwoAddress = 1 in {
-def Int_CMPSSrr : SSI<0xC2, MRMSrcReg, 
-                      (ops VR128:$dst, VR128:$src1, VR128:$src, SSECC:$cc),
-                      "cmp${cc}ss {$src, $dst|$dst, $src}",
-                      [(set VR128:$dst, (int_x86_sse_cmp_ss VR128:$src1,
-                                         VR128:$src, imm:$cc))]>;
-def Int_CMPSSrm : SSI<0xC2, MRMSrcMem, 
-                      (ops VR128:$dst, VR128:$src1, f32mem:$src, SSECC:$cc),
-                      "cmp${cc}ss {$src, $dst|$dst, $src}",
-                      [(set VR128:$dst, (int_x86_sse_cmp_ss VR128:$src1,
-                                         (load addr:$src), imm:$cc))]>;
-def Int_CMPSDrr : SDI<0xC2, MRMSrcReg, 
-                      (ops VR128:$dst, VR128:$src1, VR128:$src, SSECC:$cc),
-                      "cmp${cc}sd {$src, $dst|$dst, $src}",
-                      [(set VR128:$dst, (int_x86_sse2_cmp_sd VR128:$src1,
-                                         VR128:$src, imm:$cc))]>;
-def Int_CMPSDrm : SDI<0xC2, MRMSrcMem, 
-                      (ops VR128:$dst, VR128:$src1, f64mem:$src, SSECC:$cc),
-                      "cmp${cc}sd {$src, $dst|$dst, $src}",
-                      [(set VR128:$dst, (int_x86_sse2_cmp_sd VR128:$src1,
-                                         (load addr:$src), imm:$cc))]>;
+  def Int_CMPSDrr : SDI<0xC2, MRMSrcReg, 
+                        (ops VR128:$dst, VR128:$src1, VR128:$src, SSECC:$cc),
+                        "cmp${cc}sd {$src, $dst|$dst, $src}",
+                        [(set VR128:$dst, (int_x86_sse2_cmp_sd VR128:$src1,
+                                           VR128:$src, imm:$cc))]>;
+  def Int_CMPSDrm : SDI<0xC2, MRMSrcMem, 
+                        (ops VR128:$dst, VR128:$src1, f64mem:$src, SSECC:$cc),
+                        "cmp${cc}sd {$src, $dst|$dst, $src}",
+                        [(set VR128:$dst, (int_x86_sse2_cmp_sd VR128:$src1,
+                                           (load addr:$src), imm:$cc))]>;
 }
 
-def Int_UCOMISSrr: PSI<0x2E, MRMSrcReg, (ops VR128:$src1, VR128:$src2),
-                       "ucomiss {$src2, $src1|$src1, $src2}",
-                       [(X86ucomi (v4f32 VR128:$src1), VR128:$src2)]>;
-def Int_UCOMISSrm: PSI<0x2E, MRMSrcMem, (ops VR128:$src1, f128mem:$src2),
-                       "ucomiss {$src2, $src1|$src1, $src2}",
-                      [(X86ucomi (v4f32 VR128:$src1), (load addr:$src2))]>;
 def Int_UCOMISDrr: PDI<0x2E, MRMSrcReg, (ops VR128:$src1, VR128:$src2),
                        "ucomisd {$src2, $src1|$src1, $src2}",
                        [(X86ucomi (v2f64 VR128:$src1), (v2f64 VR128:$src2))]>;
 def Int_UCOMISDrm: PDI<0x2E, MRMSrcMem, (ops VR128:$src1, f128mem:$src2),
                        "ucomisd {$src2, $src1|$src1, $src2}",
-                      [(X86ucomi (v2f64 VR128:$src1), (load addr:$src2))]>;
+                       [(X86ucomi (v2f64 VR128:$src1), (load addr:$src2))]>;
 
-def Int_COMISSrr: PSI<0x2F, MRMSrcReg, (ops VR128:$src1, VR128:$src2),
-                      "comiss {$src2, $src1|$src1, $src2}",
-                      [(X86comi (v4f32 VR128:$src1), VR128:$src2)]>;
-def Int_COMISSrm: PSI<0x2F, MRMSrcMem, (ops VR128:$src1, f128mem:$src2),
-                      "comiss {$src2, $src1|$src1, $src2}",
-                      [(X86comi (v4f32 VR128:$src1), (load addr:$src2))]>;
 def Int_COMISDrr: PDI<0x2F, MRMSrcReg, (ops VR128:$src1, VR128:$src2),
                       "comisd {$src2, $src1|$src1, $src2}",
                       [(X86comi (v2f64 VR128:$src1), (v2f64 VR128:$src2))]>;
@@ -591,123 +956,120 @@
 // start with 'Fs'.
 
 // Alias instructions that map fld0 to pxor for sse.
-def FsFLD0SS : I<0xEF, MRMInitReg, (ops FR32:$dst),
-                 "pxor $dst, $dst", [(set FR32:$dst, fp32imm0)]>,
-               Requires<[HasSSE1]>, TB, OpSize;
 def FsFLD0SD : I<0xEF, MRMInitReg, (ops FR64:$dst),
                  "pxor $dst, $dst", [(set FR64:$dst, fp64imm0)]>,
                Requires<[HasSSE2]>, TB, OpSize;
 
-// Alias instructions to do FR32 / FR64 reg-to-reg copy using movaps / movapd.
-// Upper bits are disregarded.
-def FsMOVAPSrr : PSI<0x28, MRMSrcReg, (ops FR32:$dst, FR32:$src),
-                   "movaps {$src, $dst|$dst, $src}", []>;
+// Alias instructions to do FR64 reg-to-reg copy using movapd. Upper bits are
+// disregarded.
 def FsMOVAPDrr : PDI<0x28, MRMSrcReg, (ops FR64:$dst, FR64:$src),
                    "movapd {$src, $dst|$dst, $src}", []>;
 
-// Alias instructions to load FR32 / FR64 from f128mem using movaps / movapd.
-// Upper bits are disregarded.
-def FsMOVAPSrm : PSI<0x28, MRMSrcMem, (ops FR32:$dst, f128mem:$src),
-                   "movaps {$src, $dst|$dst, $src}",
-                   [(set FR32:$dst, (X86loadpf32 addr:$src))]>;
+// Alias instructions to load FR64 from f128mem using movapd. Upper bits are
+// disregarded.
 def FsMOVAPDrm : PDI<0x28, MRMSrcMem, (ops FR64:$dst, f128mem:$src),
                   "movapd {$src, $dst|$dst, $src}",
                   [(set FR64:$dst, (X86loadpf64 addr:$src))]>;
 
-// Alias bitwise logical operations using SSE logical ops on packed FP values.
-let isTwoAddress = 1 in {
-let isCommutable = 1 in {
-def FsANDPSrr : PSI<0x54, MRMSrcReg, (ops FR32:$dst, FR32:$src1, FR32:$src2),
-                  "andps {$src2, $dst|$dst, $src2}",
-                  [(set FR32:$dst, (X86fand FR32:$src1, FR32:$src2))]>;
-def FsANDPDrr : PDI<0x54, MRMSrcReg, (ops FR64:$dst, FR64:$src1, FR64:$src2),
-                  "andpd {$src2, $dst|$dst, $src2}",
-                  [(set FR64:$dst, (X86fand FR64:$src1, FR64:$src2))]>;
-def FsORPSrr  : PSI<0x56, MRMSrcReg, (ops FR32:$dst, FR32:$src1, FR32:$src2),
-                  "orps {$src2, $dst|$dst, $src2}",
-                  [(set FR32:$dst, (X86for FR32:$src1, FR32:$src2))]>;
-def FsORPDrr  : PDI<0x56, MRMSrcReg, (ops FR64:$dst, FR64:$src1, FR64:$src2),
-                  "orpd {$src2, $dst|$dst, $src2}",
-                  [(set FR64:$dst, (X86for FR64:$src1, FR64:$src2))]>;
-def FsXORPSrr : PSI<0x57, MRMSrcReg, (ops FR32:$dst, FR32:$src1, FR32:$src2),
-                  "xorps {$src2, $dst|$dst, $src2}",
-                  [(set FR32:$dst, (X86fxor FR32:$src1, FR32:$src2))]>;
-def FsXORPDrr : PDI<0x57, MRMSrcReg, (ops FR64:$dst, FR64:$src1, FR64:$src2),
-                  "xorpd {$src2, $dst|$dst, $src2}",
-                  [(set FR64:$dst, (X86fxor FR64:$src1, FR64:$src2))]>;
-}
-def FsANDPSrm : PSI<0x54, MRMSrcMem, (ops FR32:$dst, FR32:$src1, f128mem:$src2),
-                  "andps {$src2, $dst|$dst, $src2}",
-                  [(set FR32:$dst, (X86fand FR32:$src1,
-                                    (X86loadpf32 addr:$src2)))]>;
-def FsANDPDrm : PDI<0x54, MRMSrcMem, (ops FR64:$dst, FR64:$src1, f128mem:$src2),
-                  "andpd {$src2, $dst|$dst, $src2}",
-                  [(set FR64:$dst, (X86fand FR64:$src1,
-                                    (X86loadpf64 addr:$src2)))]>;
-def FsORPSrm  : PSI<0x56, MRMSrcMem, (ops FR32:$dst, FR32:$src1, f128mem:$src2),
-                  "orps {$src2, $dst|$dst, $src2}",
-                  [(set FR32:$dst, (X86for FR32:$src1,
-                                    (X86loadpf32 addr:$src2)))]>;
-def FsORPDrm  : PDI<0x56, MRMSrcMem, (ops FR64:$dst, FR64:$src1, f128mem:$src2),
-                  "orpd {$src2, $dst|$dst, $src2}",
-                  [(set FR64:$dst, (X86for FR64:$src1,
-                                    (X86loadpf64 addr:$src2)))]>;
-def FsXORPSrm : PSI<0x57, MRMSrcMem, (ops FR32:$dst, FR32:$src1, f128mem:$src2),
-                  "xorps {$src2, $dst|$dst, $src2}",
-                  [(set FR32:$dst, (X86fxor FR32:$src1,
-                                    (X86loadpf32 addr:$src2)))]>;
-def FsXORPDrm : PDI<0x57, MRMSrcMem, (ops FR64:$dst, FR64:$src1, f128mem:$src2),
-                  "xorpd {$src2, $dst|$dst, $src2}",
-                  [(set FR64:$dst, (X86fxor FR64:$src1,
-                                    (X86loadpf64 addr:$src2)))]>;
+// Alias bitwise logical operations using SSE logical ops on packed FP values.
+let isTwoAddress = 1 in {
+let isCommutable = 1 in {
+  def FsANDPDrr : PDI<0x54, MRMSrcReg, (ops FR64:$dst, FR64:$src1, FR64:$src2),
+                      "andpd {$src2, $dst|$dst, $src2}",
+                      [(set FR64:$dst, (X86fand FR64:$src1, FR64:$src2))]>;
+  def FsORPDrr  : PDI<0x56, MRMSrcReg, (ops FR64:$dst, FR64:$src1, FR64:$src2),
+                      "orpd {$src2, $dst|$dst, $src2}",
+                      [(set FR64:$dst, (X86for FR64:$src1, FR64:$src2))]>;
+  def FsXORPDrr : PDI<0x57, MRMSrcReg, (ops FR64:$dst, FR64:$src1, FR64:$src2),
+                      "xorpd {$src2, $dst|$dst, $src2}",
+                      [(set FR64:$dst, (X86fxor FR64:$src1, FR64:$src2))]>;
+}
+
+def FsANDPDrm : PDI<0x54, MRMSrcMem, (ops FR64:$dst, FR64:$src1, f128mem:$src2),
+                    "andpd {$src2, $dst|$dst, $src2}",
+                    [(set FR64:$dst, (X86fand FR64:$src1,
+                                      (X86loadpf64 addr:$src2)))]>;
+def FsORPDrm  : PDI<0x56, MRMSrcMem, (ops FR64:$dst, FR64:$src1, f128mem:$src2),
+                    "orpd {$src2, $dst|$dst, $src2}",
+                    [(set FR64:$dst, (X86for FR64:$src1,
+                                      (X86loadpf64 addr:$src2)))]>;
+def FsXORPDrm : PDI<0x57, MRMSrcMem, (ops FR64:$dst, FR64:$src1, f128mem:$src2),
+                    "xorpd {$src2, $dst|$dst, $src2}",
+                    [(set FR64:$dst, (X86fxor FR64:$src1,
+                                      (X86loadpf64 addr:$src2)))]>;
+
+def FsANDNPDrr : PDI<0x55, MRMSrcReg,
+                     (ops FR64:$dst, FR64:$src1, FR64:$src2),
+                     "andnpd {$src2, $dst|$dst, $src2}", []>;
+def FsANDNPDrm : PDI<0x55, MRMSrcMem,
+                     (ops FR64:$dst, FR64:$src1, f128mem:$src2),
+                     "andnpd {$src2, $dst|$dst, $src2}", []>;
+}
+
+/// scalar_sse2_fp_binop_rm - Scalar SSE2 binops come in three basic forms:
+///  
+///  1. f64 - This comes in SSE2 form for doubles.
+///  2. rr vs rm - They include a reg+reg form and a reg+mem form.
+///
+/// In addition, scalar SSE ops have an intrinsic form.  This form is unlike the
+/// normal form, in that they take an entire vector (instead of a scalar) and
+/// leave the top elements undefined.  This adds another two variants of the
+/// above permutations, giving us 8 forms for 'instruction'.
+///
+let isTwoAddress = 1 in {
+multiclass scalar_sse2_fp_binop_rm opc, string OpcodeStr,
+                                   SDNode OpNode, Intrinsic F64Int,
+                                   bit Commutable = 0> {
+  // Scalar operation, reg+reg.
+  def SDrr : SDI {
+    let isCommutable = Commutable;
+  }
+
+  // Scalar operation, reg+mem.
+  def SDrm : SDI;
+                 
+  // Vector intrinsic operation, reg+reg.
+  def SDrr_Int : SDI {
+    let isCommutable = Commutable;
+  }
 
-def FsANDNPSrr : PSI<0x55, MRMSrcReg, (ops FR32:$dst, FR32:$src1, FR32:$src2),
-                   "andnps {$src2, $dst|$dst, $src2}", []>;
-def FsANDNPSrm : PSI<0x55, MRMSrcMem, (ops FR32:$dst, FR32:$src1, f128mem:$src2),
-                   "andnps {$src2, $dst|$dst, $src2}", []>;
-def FsANDNPDrr : PDI<0x55, MRMSrcReg, (ops FR64:$dst, FR64:$src1, FR64:$src2),
-                   "andnpd {$src2, $dst|$dst, $src2}", []>;
-def FsANDNPDrm : PDI<0x55, MRMSrcMem, (ops FR64:$dst, FR64:$src1, f128mem:$src2),
-                   "andnpd {$src2, $dst|$dst, $src2}", []>;
+  // Vector intrinsic operation, reg+mem.
+  def SDrm_Int : SDI;
+}
 }
 
+// Arithmetic instructions
+defm ADD : scalar_sse2_fp_binop_rm<0x58, "add", fadd, int_x86_sse2_add_sd, 1>;
+defm MUL : scalar_sse2_fp_binop_rm<0x59, "mul", fmul, int_x86_sse2_mul_sd, 1>;
+defm SUB : scalar_sse2_fp_binop_rm<0x5C, "sub", fsub, int_x86_sse2_sub_sd>;
+defm DIV : scalar_sse2_fp_binop_rm<0x5E, "div", fdiv, int_x86_sse2_div_sd>;
+
+defm MAX : scalar_sse2_fp_binop_rm<0x5F, "max", X86fmax, int_x86_sse2_max_sd>;
+defm MIN : scalar_sse2_fp_binop_rm<0x5D, "min", X86fmin, int_x86_sse2_min_sd>;
+
 //===----------------------------------------------------------------------===//
 // SSE packed FP Instructions
-//===----------------------------------------------------------------------===//
-
-// Some 'special' instructions
-def IMPLICIT_DEF_VR128 : I<0, Pseudo, (ops VR128:$dst),
-                           "#IMPLICIT_DEF $dst",
-                           [(set VR128:$dst, (v4f32 (undef)))]>,
-                         Requires<[HasSSE1]>;
 
 // Move Instructions
-def MOVAPSrr : PSI<0x28, MRMSrcReg, (ops VR128:$dst, VR128:$src),
-                   "movaps {$src, $dst|$dst, $src}", []>;
-def MOVAPSrm : PSI<0x28, MRMSrcMem, (ops VR128:$dst, f128mem:$src),
-                   "movaps {$src, $dst|$dst, $src}",
-                   [(set VR128:$dst, (loadv4f32 addr:$src))]>;
 def MOVAPDrr : PDI<0x28, MRMSrcReg, (ops VR128:$dst, VR128:$src),
                    "movapd {$src, $dst|$dst, $src}", []>;
 def MOVAPDrm : PDI<0x28, MRMSrcMem, (ops VR128:$dst, f128mem:$src),
                    "movapd {$src, $dst|$dst, $src}",
                    [(set VR128:$dst, (loadv2f64 addr:$src))]>;
 
-def MOVAPSmr : PSI<0x29, MRMDestMem, (ops f128mem:$dst, VR128:$src),
-                   "movaps {$src, $dst|$dst, $src}",
-                   [(store (v4f32 VR128:$src), addr:$dst)]>;
 def MOVAPDmr : PDI<0x29, MRMDestMem, (ops f128mem:$dst, VR128:$src),
                    "movapd {$src, $dst|$dst, $src}",
                    [(store (v2f64 VR128:$src), addr:$dst)]>;
 
-def MOVUPSrr : PSI<0x10, MRMSrcReg, (ops VR128:$dst, VR128:$src),
-                   "movups {$src, $dst|$dst, $src}", []>;
-def MOVUPSrm : PSI<0x10, MRMSrcMem, (ops VR128:$dst, f128mem:$src),
-                   "movups {$src, $dst|$dst, $src}",
-                   [(set VR128:$dst, (int_x86_sse_loadu_ps addr:$src))]>;
-def MOVUPSmr : PSI<0x11, MRMDestMem, (ops f128mem:$dst, VR128:$src),
-                   "movups {$src, $dst|$dst, $src}",
-                   [(int_x86_sse_storeu_ps addr:$dst, VR128:$src)]>;
 def MOVUPDrr : PDI<0x10, MRMSrcReg, (ops VR128:$dst, VR128:$src),
                    "movupd {$src, $dst|$dst, $src}", []>;
 def MOVUPDrm : PDI<0x10, MRMSrcMem, (ops VR128:$dst, f128mem:$src),
@@ -718,38 +1080,24 @@
                    [(int_x86_sse2_storeu_pd addr:$dst, VR128:$src)]>;
 
 let isTwoAddress = 1 in {
-let AddedComplexity = 20 in {
-def MOVLPSrm : PSI<0x12, MRMSrcMem, (ops VR128:$dst, VR128:$src1, f64mem:$src2),
-                   "movlps {$src2, $dst|$dst, $src2}",
-                   [(set VR128:$dst, 
-                     (v4f32 (vector_shuffle VR128:$src1,
-                     (bc_v4f32 (v2f64 (scalar_to_vector (loadf64 addr:$src2)))),
-                             MOVLP_shuffle_mask)))]>;
-def MOVLPDrm : PDI<0x12, MRMSrcMem, (ops VR128:$dst, VR128:$src1, f64mem:$src2),
-                   "movlpd {$src2, $dst|$dst, $src2}",
-                   [(set VR128:$dst, 
-                     (v2f64 (vector_shuffle VR128:$src1,
-                             (scalar_to_vector (loadf64 addr:$src2)),
-                             MOVLP_shuffle_mask)))]>;
-def MOVHPSrm : PSI<0x16, MRMSrcMem, (ops VR128:$dst, VR128:$src1, f64mem:$src2),
-                   "movhps {$src2, $dst|$dst, $src2}",
-                   [(set VR128:$dst, 
-                     (v4f32 (vector_shuffle VR128:$src1,
-                     (bc_v4f32 (v2f64 (scalar_to_vector (loadf64 addr:$src2)))),
-                             MOVHP_shuffle_mask)))]>;
-def MOVHPDrm : PDI<0x16, MRMSrcMem, (ops VR128:$dst, VR128:$src1, f64mem:$src2),
-                   "movhpd {$src2, $dst|$dst, $src2}",
-                   [(set VR128:$dst, 
-                     (v2f64 (vector_shuffle VR128:$src1,
-                             (scalar_to_vector (loadf64 addr:$src2)),
-                             MOVHP_shuffle_mask)))]>;
-} // AddedComplexity
-}
+  let AddedComplexity = 20 in {
+    def MOVLPDrm : PDI<0x12, MRMSrcMem,
+                       (ops VR128:$dst, VR128:$src1, f64mem:$src2),
+                       "movlpd {$src2, $dst|$dst, $src2}",
+                       [(set VR128:$dst, 
+                         (v2f64 (vector_shuffle VR128:$src1,
+                                 (scalar_to_vector (loadf64 addr:$src2)),
+                                 MOVLP_shuffle_mask)))]>;
+    def MOVHPDrm : PDI<0x16, MRMSrcMem,
+                       (ops VR128:$dst, VR128:$src1, f64mem:$src2),
+                       "movhpd {$src2, $dst|$dst, $src2}",
+                       [(set VR128:$dst, 
+                         (v2f64 (vector_shuffle VR128:$src1,
+                                 (scalar_to_vector (loadf64 addr:$src2)),
+                                 MOVHP_shuffle_mask)))]>;
+  } // AddedComplexity
+} // isTwoAddress
 
-def MOVLPSmr : PSI<0x13, MRMDestMem, (ops f64mem:$dst, VR128:$src),
-                   "movlps {$src, $dst|$dst, $src}",
-                   [(store (f64 (vector_extract (bc_v2f64 (v4f32 VR128:$src)),
-                                 (iPTR 0))), addr:$dst)]>;
 def MOVLPDmr : PDI<0x13, MRMDestMem, (ops f64mem:$dst, VR128:$src),
                    "movlpd {$src, $dst|$dst, $src}",
                    [(store (f64 (vector_extract (v2f64 VR128:$src),
@@ -757,13 +1105,6 @@
 
 // v2f64 extract element 1 is always custom lowered to unpack high to low
 // and extract element 0 so the non-store version isn't too horrible.
-def MOVHPSmr : PSI<0x17, MRMDestMem, (ops f64mem:$dst, VR128:$src),
-                   "movhps {$src, $dst|$dst, $src}",
-                   [(store (f64 (vector_extract
-                                 (v2f64 (vector_shuffle
-                                         (bc_v2f64 (v4f32 VR128:$src)), (undef),
-                                         UNPCKH_shuffle_mask)), (iPTR 0))),
-                     addr:$dst)]>;
 def MOVHPDmr : PDI<0x17, MRMDestMem, (ops f64mem:$dst, VR128:$src),
                    "movhpd {$src, $dst|$dst, $src}",
                    [(store (f64 (vector_extract
@@ -771,56 +1112,6 @@
                                          UNPCKH_shuffle_mask)), (iPTR 0))),
                      addr:$dst)]>;
 
-let isTwoAddress = 1 in {
-let AddedComplexity = 15 in {
-def MOVLHPSrr : PSI<0x16, MRMSrcReg, (ops VR128:$dst, VR128:$src1, VR128:$src2),
-                    "movlhps {$src2, $dst|$dst, $src2}",
-                    [(set VR128:$dst,
-                      (v4f32 (vector_shuffle VR128:$src1, VR128:$src2,
-                              MOVHP_shuffle_mask)))]>;
-
-def MOVHLPSrr : PSI<0x12, MRMSrcReg, (ops VR128:$dst, VR128:$src1, VR128:$src2),
-                    "movhlps {$src2, $dst|$dst, $src2}",
-                    [(set VR128:$dst,
-                      (v4f32 (vector_shuffle VR128:$src1, VR128:$src2,
-                              MOVHLPS_shuffle_mask)))]>;
-} // AddedComplexity
-}
-
-def MOVSHDUPrr : S3SI<0x16, MRMSrcReg, (ops VR128:$dst, VR128:$src),
-                      "movshdup {$src, $dst|$dst, $src}",
-                      [(set VR128:$dst, (v4f32 (vector_shuffle
-                                                VR128:$src, (undef),
-                                                MOVSHDUP_shuffle_mask)))]>;
-def MOVSHDUPrm : S3SI<0x16, MRMSrcMem, (ops VR128:$dst, f128mem:$src),
-                      "movshdup {$src, $dst|$dst, $src}",
-                      [(set VR128:$dst, (v4f32 (vector_shuffle
-                                                (loadv4f32 addr:$src), (undef),
-                                                MOVSHDUP_shuffle_mask)))]>;
-
-def MOVSLDUPrr : S3SI<0x12, MRMSrcReg, (ops VR128:$dst, VR128:$src),
-                      "movsldup {$src, $dst|$dst, $src}",
-                      [(set VR128:$dst, (v4f32 (vector_shuffle
-                                                VR128:$src, (undef),
-                                                MOVSLDUP_shuffle_mask)))]>;
-def MOVSLDUPrm : S3SI<0x12, MRMSrcMem, (ops VR128:$dst, f128mem:$src),
-                      "movsldup {$src, $dst|$dst, $src}",
-                      [(set VR128:$dst, (v4f32 (vector_shuffle
-                                                (loadv4f32 addr:$src), (undef),
-                                                MOVSLDUP_shuffle_mask)))]>;
-
-def MOVDDUPrr : S3DI<0x12, MRMSrcReg, (ops VR128:$dst, VR128:$src),
-                      "movddup {$src, $dst|$dst, $src}",
-                  [(set VR128:$dst, (v2f64 (vector_shuffle
-                                            VR128:$src, (undef),
-                                            SSE_splat_lo_mask)))]>;
-def MOVDDUPrm : S3DI<0x12, MRMSrcMem, (ops VR128:$dst, f64mem:$src),
-                  "movddup {$src, $dst|$dst, $src}",
-                  [(set VR128:$dst, (v2f64 (vector_shuffle
-                                         (scalar_to_vector (loadf64 addr:$src)),
-                                             (undef),
-                                            SSE_splat_lo_mask)))]>;
-
 // SSE2 instructions without OpSize prefix
 def Int_CVTDQ2PSrr : I<0x5B, MRMSrcReg, (ops VR128:$dst, VR128:$src),
                        "cvtdq2ps {$src, $dst|$dst, $src}",
@@ -871,6 +1162,7 @@
                        [(set VR128:$dst, (int_x86_sse2_cvtpd2dq
                                           (load addr:$src)))]>,
                      XD, Requires<[HasSSE2]>;
+
 def Int_CVTTPD2DQrr : PDI<0xE6, MRMSrcReg, (ops VR128:$dst, VR128:$src),
                           "cvttpd2dq {$src, $dst|$dst, $src}",
                        [(set VR128:$dst, (int_x86_sse2_cvttpd2dq VR128:$src))]>;
@@ -935,300 +1227,186 @@
                     Requires<[HasSSE2]>;
 }
 
-/// packed_sse12_fp_binop_rm - Packed SSE binops come in four basic forms:
-///  1. v4f32 vs v2f64 - These come in SSE1/SSE2 forms for float/doubles.
+/// packed_sse2_fp_binop_rm - Packed SSE binops come in three basic forms:
+///  1. v2f64    - This comes in SSE2 form for doubles.
 ///  2. rr vs rm - They include a reg+reg form and a ref+mem form.
 ///
 let isTwoAddress = 1 in {
-multiclass packed_sse12_fp_binop_rm opc, string OpcodeStr,
-                                    SDNode OpNode, bit Commutable = 0> {
+multiclass packed_sse2_fp_binop_rm opc, string OpcodeStr,
+                                   SDNode OpNode, bit Commutable = 0> {
   // Packed operation, reg+reg.
-  def PSrr : PSI {
-    let isCommutable = Commutable;
-  }
   def PDrr : PDI {
     let isCommutable = Commutable;
   }
+
   // Packed operation, reg+mem.
-  def PSrm : PSI;
   def PDrm : PDI;
 }
 }
 
-defm ADD : packed_sse12_fp_binop_rm<0x58, "add", fadd, 1>;
-defm MUL : packed_sse12_fp_binop_rm<0x59, "mul", fmul, 1>;
-defm DIV : packed_sse12_fp_binop_rm<0x5E, "div", fdiv>;
-defm SUB : packed_sse12_fp_binop_rm<0x5C, "sub", fsub>;
+defm ADD : packed_sse2_fp_binop_rm<0x58, "add", fadd, 1>;
+defm MUL : packed_sse2_fp_binop_rm<0x59, "mul", fmul, 1>;
+defm DIV : packed_sse2_fp_binop_rm<0x5E, "div", fdiv>;
+defm SUB : packed_sse2_fp_binop_rm<0x5C, "sub", fsub>;
 
 // Arithmetic
-let isTwoAddress = 1 in {
-def ADDSUBPSrr : S3DI<0xD0, MRMSrcReg,
-                      (ops VR128:$dst, VR128:$src1, VR128:$src2),
-                      "addsubps {$src2, $dst|$dst, $src2}",
-                      [(set VR128:$dst, (int_x86_sse3_addsub_ps VR128:$src1,
-                                         VR128:$src2))]>;
-def ADDSUBPSrm : S3DI<0xD0, MRMSrcMem,
-                      (ops VR128:$dst, VR128:$src1, f128mem:$src2),
-                      "addsubps {$src2, $dst|$dst, $src2}",
-                      [(set VR128:$dst, (int_x86_sse3_addsub_ps VR128:$src1,
-                                         (load addr:$src2)))]>;
-def ADDSUBPDrr : S3I<0xD0, MRMSrcReg,
-                      (ops VR128:$dst, VR128:$src1, VR128:$src2),
-                      "addsubpd {$src2, $dst|$dst, $src2}",
-                      [(set VR128:$dst, (int_x86_sse3_addsub_pd VR128:$src1,
-                                         VR128:$src2))]>;
-def ADDSUBPDrm : S3I<0xD0, MRMSrcMem,
-                      (ops VR128:$dst, VR128:$src1, f128mem:$src2),
-                      "addsubpd {$src2, $dst|$dst, $src2}",
-                      [(set VR128:$dst, (int_x86_sse3_addsub_pd VR128:$src1,
-                                         (load addr:$src2)))]>;
-}
 
-def SQRTPSr  : PS_Intr<0x51, "sqrtps", int_x86_sse_sqrt_ps>;
-def SQRTPSm  : PS_Intm<0x51, "sqrtps", int_x86_sse_sqrt_ps>;
+class PD_Intr o, string OpcodeStr, Intrinsic IntId>
+  : PDI;
+class PD_Intm o, string OpcodeStr, Intrinsic IntId>
+  : PDI;
+
+class PD_Intrr o, string OpcodeStr, Intrinsic IntId>
+  : PDI;
+class PD_Intrm o, string OpcodeStr, Intrinsic IntId>
+  : PDI;
+
 def SQRTPDr  : PD_Intr<0x51, "sqrtpd", int_x86_sse2_sqrt_pd>;
 def SQRTPDm  : PD_Intm<0x51, "sqrtpd", int_x86_sse2_sqrt_pd>;
 
-def RSQRTPSr : PS_Intr<0x52, "rsqrtps", int_x86_sse_rsqrt_ps>;
-def RSQRTPSm : PS_Intm<0x52, "rsqrtps", int_x86_sse_rsqrt_ps>;
-def RCPPSr   : PS_Intr<0x53, "rcpps", int_x86_sse_rcp_ps>;
-def RCPPSm   : PS_Intm<0x53, "rcpps", int_x86_sse_rcp_ps>;
-
 let isTwoAddress = 1 in {
-let isCommutable = 1 in {
-def MAXPSrr  : PS_Intrr<0x5F, "maxps", int_x86_sse_max_ps>;
-def MAXPDrr  : PD_Intrr<0x5F, "maxpd", int_x86_sse2_max_pd>;
-def MINPSrr  : PS_Intrr<0x5D, "minps", int_x86_sse_min_ps>;
-def MINPDrr  : PD_Intrr<0x5D, "minpd", int_x86_sse2_min_pd>;
-}
-def MAXPSrm  : PS_Intrm<0x5F, "maxps", int_x86_sse_max_ps>;
-def MAXPDrm  : PD_Intrm<0x5F, "maxpd", int_x86_sse2_max_pd>;
-def MINPSrm  : PS_Intrm<0x5D, "minps", int_x86_sse_min_ps>;
-def MINPDrm  : PD_Intrm<0x5D, "minpd", int_x86_sse2_min_pd>;
+  let isCommutable = 1 in {
+    def MAXPDrr  : PD_Intrr<0x5F, "maxpd", int_x86_sse2_max_pd>;
+    def MINPDrr  : PD_Intrr<0x5D, "minpd", int_x86_sse2_min_pd>;
+  }
+
+  def MAXPDrm  : PD_Intrm<0x5F, "maxpd", int_x86_sse2_max_pd>;
+  def MINPDrm  : PD_Intrm<0x5D, "minpd", int_x86_sse2_min_pd>;
 }
 
 // Logical
 let isTwoAddress = 1 in {
-let isCommutable = 1 in {
-def ANDPSrr : PSI<0x54, MRMSrcReg, (ops VR128:$dst, VR128:$src1, VR128:$src2),
-                  "andps {$src2, $dst|$dst, $src2}",
-                  [(set VR128:$dst, (v2i64 (and VR128:$src1, VR128:$src2)))]>;
-def ANDPDrr : PDI<0x54, MRMSrcReg, (ops VR128:$dst, VR128:$src1, VR128:$src2),
-                "andpd {$src2, $dst|$dst, $src2}",
-                  [(set VR128:$dst,
-                    (and (bc_v2i64 (v2f64 VR128:$src1)),
+  let isCommutable = 1 in {
+    def ANDPDrr : PDI<0x54, MRMSrcReg,
+                      (ops VR128:$dst, VR128:$src1, VR128:$src2),
+                      "andpd {$src2, $dst|$dst, $src2}",
+                      [(set VR128:$dst,
+                        (and (bc_v2i64 (v2f64 VR128:$src1)),
                          (bc_v2i64 (v2f64 VR128:$src2))))]>;
-def ORPSrr  : PSI<0x56, MRMSrcReg, (ops VR128:$dst, VR128:$src1, VR128:$src2),
-                  "orps {$src2, $dst|$dst, $src2}",
-                  [(set VR128:$dst, (v2i64 (or VR128:$src1, VR128:$src2)))]>;
-def ORPDrr  : PDI<0x56, MRMSrcReg, (ops VR128:$dst, VR128:$src1, VR128:$src2),
-                  "orpd {$src2, $dst|$dst, $src2}",
-                  [(set VR128:$dst,
-                    (or (bc_v2i64 (v2f64 VR128:$src1)),
-                        (bc_v2i64 (v2f64 VR128:$src2))))]>;
-def XORPSrr : PSI<0x57, MRMSrcReg, (ops VR128:$dst, VR128:$src1, VR128:$src2),
-                  "xorps {$src2, $dst|$dst, $src2}",
-                  [(set VR128:$dst, (v2i64 (xor VR128:$src1, VR128:$src2)))]>;
-def XORPDrr : PDI<0x57, MRMSrcReg, (ops VR128:$dst, VR128:$src1, VR128:$src2),
-                  "xorpd {$src2, $dst|$dst, $src2}",
-                  [(set VR128:$dst,
-                    (xor (bc_v2i64 (v2f64 VR128:$src1)),
+    def ORPDrr  : PDI<0x56, MRMSrcReg,
+                      (ops VR128:$dst, VR128:$src1, VR128:$src2),
+                      "orpd {$src2, $dst|$dst, $src2}",
+                      [(set VR128:$dst,
+                        (or (bc_v2i64 (v2f64 VR128:$src1)),
                          (bc_v2i64 (v2f64 VR128:$src2))))]>;
-}
-def ANDPSrm : PSI<0x54, MRMSrcMem, (ops VR128:$dst, VR128:$src1, f128mem:$src2),
-                  "andps {$src2, $dst|$dst, $src2}",
-                  [(set VR128:$dst, (and VR128:$src1,
-                                          (bc_v2i64 (loadv4f32 addr:$src2))))]>;
-def ANDPDrm : PDI<0x54, MRMSrcMem, (ops VR128:$dst, VR128:$src1, f128mem:$src2),
-                  "andpd {$src2, $dst|$dst, $src2}",
-                [(set VR128:$dst,
-                  (and (bc_v2i64 (v2f64 VR128:$src1)),
+    def XORPDrr : PDI<0x57, MRMSrcReg,
+                      (ops VR128:$dst, VR128:$src1, VR128:$src2),
+                      "xorpd {$src2, $dst|$dst, $src2}",
+                      [(set VR128:$dst,
+                        (xor (bc_v2i64 (v2f64 VR128:$src1)),
+                         (bc_v2i64 (v2f64 VR128:$src2))))]>;
+  }
+
+  def ANDPDrm : PDI<0x54, MRMSrcMem,
+                    (ops VR128:$dst, VR128:$src1, f128mem:$src2),
+                    "andpd {$src2, $dst|$dst, $src2}",
+                    [(set VR128:$dst,
+                      (and (bc_v2i64 (v2f64 VR128:$src1)),
                        (bc_v2i64 (loadv2f64 addr:$src2))))]>;
-def ORPSrm  : PSI<0x56, MRMSrcMem, (ops VR128:$dst, VR128:$src1, f128mem:$src2),
-                  "orps {$src2, $dst|$dst, $src2}",
-                  [(set VR128:$dst, (or VR128:$src1,
-                                          (bc_v2i64 (loadv4f32 addr:$src2))))]>;
-def ORPDrm  : PDI<0x56, MRMSrcMem, (ops VR128:$dst, VR128:$src1, f128mem:$src2),
-                "orpd {$src2, $dst|$dst, $src2}",
-                 [(set VR128:$dst,
-                   (or (bc_v2i64 (v2f64 VR128:$src1)),
+  def ORPDrm  : PDI<0x56, MRMSrcMem,
+                    (ops VR128:$dst, VR128:$src1, f128mem:$src2),
+                    "orpd {$src2, $dst|$dst, $src2}",
+                    [(set VR128:$dst,
+                      (or (bc_v2i64 (v2f64 VR128:$src1)),
                        (bc_v2i64 (loadv2f64 addr:$src2))))]>;
-def XORPSrm : PSI<0x57, MRMSrcMem, (ops VR128:$dst, VR128:$src1, f128mem:$src2),
-                  "xorps {$src2, $dst|$dst, $src2}",
-                  [(set VR128:$dst, (xor VR128:$src1,
-                                          (bc_v2i64 (loadv4f32 addr:$src2))))]>;
-def XORPDrm : PDI<0x57, MRMSrcMem, (ops VR128:$dst, VR128:$src1, f128mem:$src2),
-                  "xorpd {$src2, $dst|$dst, $src2}",
-                [(set VR128:$dst,
-                  (xor (bc_v2i64 (v2f64 VR128:$src1)),
+  def XORPDrm : PDI<0x57, MRMSrcMem,
+                    (ops VR128:$dst, VR128:$src1, f128mem:$src2),
+                    "xorpd {$src2, $dst|$dst, $src2}",
+                    [(set VR128:$dst,
+                      (xor (bc_v2i64 (v2f64 VR128:$src1)),
                        (bc_v2i64 (loadv2f64 addr:$src2))))]>;
-def ANDNPSrr : PSI<0x55, MRMSrcReg, (ops VR128:$dst, VR128:$src1, VR128:$src2),
-                  "andnps {$src2, $dst|$dst, $src2}",
-                  [(set VR128:$dst, (v2i64 (and (xor VR128:$src1,
-                                                (bc_v2i64 (v4i32 immAllOnesV))),
-                                            VR128:$src2)))]>;
-def ANDNPSrm : PSI<0x55, MRMSrcMem, (ops VR128:$dst, VR128:$src1,f128mem:$src2),
-                  "andnps {$src2, $dst|$dst, $src2}",
-                  [(set VR128:$dst, (v2i64 (and (xor VR128:$src1,
-                                                (bc_v2i64 (v4i32 immAllOnesV))),
-                                         (bc_v2i64 (loadv4f32 addr:$src2)))))]>;
-def ANDNPDrr : PDI<0x55, MRMSrcReg, (ops VR128:$dst, VR128:$src1, VR128:$src2),
-                  "andnpd {$src2, $dst|$dst, $src2}",
-                [(set VR128:$dst,
-                  (and (vnot (bc_v2i64 (v2f64 VR128:$src1))),
-                       (bc_v2i64 (v2f64 VR128:$src2))))]>;
-def ANDNPDrm : PDI<0x55, MRMSrcMem, (ops VR128:$dst, VR128:$src1,f128mem:$src2),
-                  "andnpd {$src2, $dst|$dst, $src2}",
-                  [(set VR128:$dst,
-                    (and (vnot (bc_v2i64 (v2f64 VR128:$src1))),
-                         (bc_v2i64 (loadv2f64 addr:$src2))))]>;
+  def ANDNPDrr : PDI<0x55, MRMSrcReg,
+                     (ops VR128:$dst, VR128:$src1, VR128:$src2),
+                     "andnpd {$src2, $dst|$dst, $src2}",
+                     [(set VR128:$dst,
+                       (and (vnot (bc_v2i64 (v2f64 VR128:$src1))),
+                        (bc_v2i64 (v2f64 VR128:$src2))))]>;
+  def ANDNPDrm : PDI<0x55, MRMSrcMem,
+                     (ops VR128:$dst, VR128:$src1,f128mem:$src2),
+                     "andnpd {$src2, $dst|$dst, $src2}",
+                     [(set VR128:$dst,
+                       (and (vnot (bc_v2i64 (v2f64 VR128:$src1))),
+                        (bc_v2i64 (loadv2f64 addr:$src2))))]>;
 }
 
 let isTwoAddress = 1 in {
-def CMPPSrri : PSIi8<0xC2, MRMSrcReg, 
-                    (ops VR128:$dst, VR128:$src1, VR128:$src, SSECC:$cc),
-                    "cmp${cc}ps {$src, $dst|$dst, $src}",
-                    [(set VR128:$dst, (int_x86_sse_cmp_ps VR128:$src1,
-                                       VR128:$src, imm:$cc))]>;
-def CMPPSrmi : PSIi8<0xC2, MRMSrcMem, 
-                    (ops VR128:$dst, VR128:$src1, f128mem:$src, SSECC:$cc),
-                    "cmp${cc}ps {$src, $dst|$dst, $src}",
-                    [(set VR128:$dst, (int_x86_sse_cmp_ps VR128:$src1,
-                                       (load addr:$src), imm:$cc))]>;
-def CMPPDrri : PDIi8<0xC2, MRMSrcReg, 
-                    (ops VR128:$dst, VR128:$src1, VR128:$src, SSECC:$cc),
-                    "cmp${cc}pd {$src, $dst|$dst, $src}",
-                    [(set VR128:$dst, (int_x86_sse2_cmp_pd VR128:$src1,
-                                       VR128:$src, imm:$cc))]>;
-def CMPPDrmi : PDIi8<0xC2, MRMSrcMem, 
-                    (ops VR128:$dst, VR128:$src1, f128mem:$src, SSECC:$cc),
-                    "cmp${cc}pd {$src, $dst|$dst, $src}",
-                    [(set VR128:$dst, (int_x86_sse2_cmp_pd VR128:$src1,
-                                       (load addr:$src), imm:$cc))]>;
+  def CMPPDrri : PDIi8<0xC2, MRMSrcReg, 
+                      (ops VR128:$dst, VR128:$src1, VR128:$src, SSECC:$cc),
+                      "cmp${cc}pd {$src, $dst|$dst, $src}",
+                      [(set VR128:$dst, (int_x86_sse2_cmp_pd VR128:$src1,
+                                         VR128:$src, imm:$cc))]>;
+  def CMPPDrmi : PDIi8<0xC2, MRMSrcMem, 
+                      (ops VR128:$dst, VR128:$src1, f128mem:$src, SSECC:$cc),
+                      "cmp${cc}pd {$src, $dst|$dst, $src}",
+                      [(set VR128:$dst, (int_x86_sse2_cmp_pd VR128:$src1,
+                                         (load addr:$src), imm:$cc))]>;
 }
 
 // Shuffle and unpack instructions
 let isTwoAddress = 1 in {
-let isConvertibleToThreeAddress = 1 in // Convert to pshufd
-def SHUFPSrri : PSIi8<0xC6, MRMSrcReg, 
-                     (ops VR128:$dst, VR128:$src1, VR128:$src2, i32i8imm:$src3),
-                     "shufps {$src3, $src2, $dst|$dst, $src2, $src3}",
-                     [(set VR128:$dst, (v4f32 (vector_shuffle
-                                               VR128:$src1, VR128:$src2,
-                                               SHUFP_shuffle_mask:$src3)))]>;
-def SHUFPSrmi : PSIi8<0xC6, MRMSrcMem, 
-                   (ops VR128:$dst, VR128:$src1, f128mem:$src2, i32i8imm:$src3),
-                     "shufps {$src3, $src2, $dst|$dst, $src2, $src3}",
-                     [(set VR128:$dst, (v4f32 (vector_shuffle
-                                               VR128:$src1, (load addr:$src2),
-                                               SHUFP_shuffle_mask:$src3)))]>;
-def SHUFPDrri : PDIi8<0xC6, MRMSrcReg, 
-                     (ops VR128:$dst, VR128:$src1, VR128:$src2, i8imm:$src3),
-                     "shufpd {$src3, $src2, $dst|$dst, $src2, $src3}",
-                     [(set VR128:$dst, (v2f64 (vector_shuffle
-                                               VR128:$src1, VR128:$src2,
-                                               SHUFP_shuffle_mask:$src3)))]>;
-def SHUFPDrmi : PDIi8<0xC6, MRMSrcMem, 
-                     (ops VR128:$dst, VR128:$src1, f128mem:$src2, i8imm:$src3),
-                     "shufpd {$src3, $src2, $dst|$dst, $src2, $src3}",
-                     [(set VR128:$dst, (v2f64 (vector_shuffle
-                                               VR128:$src1, (load addr:$src2),
-                                               SHUFP_shuffle_mask:$src3)))]>;
-
-let AddedComplexity = 10 in {
-def UNPCKHPSrr : PSI<0x15, MRMSrcReg, 
-                    (ops VR128:$dst, VR128:$src1, VR128:$src2),
-                    "unpckhps {$src2, $dst|$dst, $src2}",
-                    [(set VR128:$dst, (v4f32 (vector_shuffle
-                                              VR128:$src1, VR128:$src2,
-                                              UNPCKH_shuffle_mask)))]>;
-def UNPCKHPSrm : PSI<0x15, MRMSrcMem, 
-                    (ops VR128:$dst, VR128:$src1, f128mem:$src2),
-                    "unpckhps {$src2, $dst|$dst, $src2}",
-                    [(set VR128:$dst, (v4f32 (vector_shuffle
-                                              VR128:$src1, (load addr:$src2),
-                                              UNPCKH_shuffle_mask)))]>;
-def UNPCKHPDrr : PDI<0x15, MRMSrcReg, 
-                    (ops VR128:$dst, VR128:$src1, VR128:$src2),
-                    "unpckhpd {$src2, $dst|$dst, $src2}",
-                    [(set VR128:$dst, (v2f64 (vector_shuffle
-                                              VR128:$src1, VR128:$src2,
-                                              UNPCKH_shuffle_mask)))]>;
-def UNPCKHPDrm : PDI<0x15, MRMSrcMem, 
-                    (ops VR128:$dst, VR128:$src1, f128mem:$src2),
-                    "unpckhpd {$src2, $dst|$dst, $src2}",
-                    [(set VR128:$dst, (v2f64 (vector_shuffle
-                                              VR128:$src1, (load addr:$src2),
-                                              UNPCKH_shuffle_mask)))]>;
-
-def UNPCKLPSrr : PSI<0x14, MRMSrcReg, 
-                    (ops VR128:$dst, VR128:$src1, VR128:$src2),
-                    "unpcklps {$src2, $dst|$dst, $src2}",
-                    [(set VR128:$dst, (v4f32 (vector_shuffle
-                                              VR128:$src1, VR128:$src2,
-                                              UNPCKL_shuffle_mask)))]>;
-def UNPCKLPSrm : PSI<0x14, MRMSrcMem, 
-                    (ops VR128:$dst, VR128:$src1, f128mem:$src2),
-                    "unpcklps {$src2, $dst|$dst, $src2}",
-                    [(set VR128:$dst, (v4f32 (vector_shuffle
-                                              VR128:$src1, (load addr:$src2),
-                                              UNPCKL_shuffle_mask)))]>;
-def UNPCKLPDrr : PDI<0x14, MRMSrcReg, 
-                    (ops VR128:$dst, VR128:$src1, VR128:$src2),
-                    "unpcklpd {$src2, $dst|$dst, $src2}",
-                    [(set VR128:$dst, (v2f64 (vector_shuffle
-                                              VR128:$src1, VR128:$src2,
-                                              UNPCKL_shuffle_mask)))]>;
-def UNPCKLPDrm : PDI<0x14, MRMSrcMem, 
-                    (ops VR128:$dst, VR128:$src1, f128mem:$src2),
-                    "unpcklpd {$src2, $dst|$dst, $src2}",
-                    [(set VR128:$dst, (v2f64 (vector_shuffle
-                                              VR128:$src1, (load addr:$src2),
-                                              UNPCKL_shuffle_mask)))]>;
-} // AddedComplexity
-}
-
-// Horizontal ops
-
-class S3D_Intrr o, string OpcodeStr, Intrinsic IntId>
-  : S3DI;
-class S3D_Intrm o, string OpcodeStr, Intrinsic IntId>
-  : S3DI;
-class S3_Intrr o, string OpcodeStr, Intrinsic IntId>
-  : S3I;
-class S3_Intrm o, string OpcodeStr, Intrinsic IntId>
-  : S3I;
+  def SHUFPDrri : PDIi8<0xC6, MRMSrcReg, 
+                        (ops VR128:$dst, VR128:$src1, VR128:$src2, i8imm:$src3),
+                        "shufpd {$src3, $src2, $dst|$dst, $src2, $src3}",
+                        [(set VR128:$dst, (v2f64 (vector_shuffle
+                                                  VR128:$src1, VR128:$src2,
+                                                  SHUFP_shuffle_mask:$src3)))]>;
+  def SHUFPDrmi : PDIi8<0xC6, MRMSrcMem, 
+                        (ops VR128:$dst, VR128:$src1,
+                         f128mem:$src2, i8imm:$src3),
+                        "shufpd {$src3, $src2, $dst|$dst, $src2, $src3}",
+                        [(set VR128:$dst,
+                          (v2f64 (vector_shuffle
+                                  VR128:$src1, (load addr:$src2),
+                                  SHUFP_shuffle_mask:$src3)))]>;
+
+  let AddedComplexity = 10 in {
+    def UNPCKHPDrr : PDI<0x15, MRMSrcReg, 
+                         (ops VR128:$dst, VR128:$src1, VR128:$src2),
+                         "unpckhpd {$src2, $dst|$dst, $src2}",
+                         [(set VR128:$dst,
+                           (v2f64 (vector_shuffle
+                                   VR128:$src1, VR128:$src2,
+                                   UNPCKH_shuffle_mask)))]>;
+    def UNPCKHPDrm : PDI<0x15, MRMSrcMem, 
+                         (ops VR128:$dst, VR128:$src1, f128mem:$src2),
+                         "unpckhpd {$src2, $dst|$dst, $src2}",
+                         [(set VR128:$dst,
+                           (v2f64 (vector_shuffle
+                                   VR128:$src1, (load addr:$src2),
+                                   UNPCKH_shuffle_mask)))]>;
+
+    def UNPCKLPDrr : PDI<0x14, MRMSrcReg, 
+                         (ops VR128:$dst, VR128:$src1, VR128:$src2),
+                         "unpcklpd {$src2, $dst|$dst, $src2}",
+                         [(set VR128:$dst,
+                           (v2f64 (vector_shuffle
+                                   VR128:$src1, VR128:$src2,
+                                   UNPCKL_shuffle_mask)))]>;
+    def UNPCKLPDrm : PDI<0x14, MRMSrcMem, 
+                         (ops VR128:$dst, VR128:$src1, f128mem:$src2),
+                         "unpcklpd {$src2, $dst|$dst, $src2}",
+                         [(set VR128:$dst,
+                           (v2f64 (vector_shuffle
+                                   VR128:$src1, (load addr:$src2),
+                                   UNPCKL_shuffle_mask)))]>;
+  } // AddedComplexity
+} // isTwoAddress
 
-let isTwoAddress = 1 in {
-def HADDPSrr : S3D_Intrr<0x7C, "haddps", int_x86_sse3_hadd_ps>;
-def HADDPSrm : S3D_Intrm<0x7C, "haddps", int_x86_sse3_hadd_ps>;
-def HADDPDrr : S3_Intrr <0x7C, "haddpd", int_x86_sse3_hadd_pd>;
-def HADDPDrm : S3_Intrm <0x7C, "haddpd", int_x86_sse3_hadd_pd>;
-def HSUBPSrr : S3D_Intrr<0x7D, "hsubps", int_x86_sse3_hsub_ps>;
-def HSUBPSrm : S3D_Intrm<0x7D, "hsubps", int_x86_sse3_hsub_ps>;
-def HSUBPDrr : S3_Intrr <0x7D, "hsubpd", int_x86_sse3_hsub_pd>;
-def HSUBPDrm : S3_Intrm <0x7D, "hsubpd", int_x86_sse3_hsub_pd>;
-}
 
 //===----------------------------------------------------------------------===//
 // SSE integer instructions
-//===----------------------------------------------------------------------===//
 
 // Move Instructions
 def MOVDQArr : PDI<0x6F, MRMSrcReg, (ops VR128:$dst, VR128:$src),
@@ -1247,12 +1425,10 @@
                    "movdqu {$src, $dst|$dst, $src}",
                    [(int_x86_sse2_storeu_dq addr:$dst, VR128:$src)]>,
                  XS, Requires<[HasSSE2]>;
-def LDDQUrm : S3DI<0xF0, MRMSrcMem, (ops VR128:$dst, i128mem:$src),
-                   "lddqu {$src, $dst|$dst, $src}",
-                   [(set VR128:$dst, (int_x86_sse3_ldu_dq addr:$src))]>;
 
 
 let isTwoAddress = 1 in {
+
 multiclass PDI_binop_rm_int opc, string OpcodeStr, Intrinsic IntId,
                             bit Commutable = 0> {
   def rr : PDI;
 }
-}
 
-let isTwoAddress = 1 in {
 multiclass PDI_binop_rmi_int opc, bits<8> opc2, Format ImmForm,
                              string OpcodeStr, Intrinsic IntId> {
   def rr : PDI;
 }
-}
 
 
-let isTwoAddress = 1 in {
 /// PDI_binop_rm - Simple SSE2 binary operator.
 multiclass PDI_binop_rm opc, string OpcodeStr, SDNode OpNode,
                         ValueType OpVT, bit Commutable = 0> {
@@ -1308,33 +1480,17 @@
 multiclass PDI_binop_rm_v2i64 opc, string OpcodeStr, SDNode OpNode,
                               bit Commutable = 0> {
   def rr : PDI {
-    let isCommutable = Commutable;
-  }
-  def rm : PDI;
-}
-}
-
-/// SS3I_binop_rm_int - Simple SSSE3 binary operatr whose type is v2i64.
-let isTwoAddress = 1 in {
-  multiclass SS3I_binop_rm_int opc, string OpcodeStr, Intrinsic IntId,
-                               bit Commutable = 0> {
-    def rr : SS38I {
-      let isCommutable = Commutable;
-    }
-    def rm : SS38I;
+               !strconcat(OpcodeStr, " {$src2, $dst|$dst, $src2}"),
+               [(set VR128:$dst, (v2i64 (OpNode VR128:$src1, VR128:$src2)))]> {
+    let isCommutable = Commutable;
   }
+  def rm : PDI;
 }
 
+} // isTwoAddress
+
 // 128-bit Integer Arithmetic
 
 defm PADDB : PDI_binop_rm<0xFC, "paddb", add, v16i8, 1>;
@@ -1363,9 +1519,6 @@
 defm PMULHW  : PDI_binop_rm_int<0xE5, "pmulhw" , int_x86_sse2_pmulh_w , 1>;
 defm PMULUDQ : PDI_binop_rm_int<0xF4, "pmuludq", int_x86_sse2_pmulu_dq, 1>;
 
-defm PMULHRSW128 : SS3I_binop_rm_int<0x0B, "pmulhrsw",
-                                     int_x86_ssse3_pmulhrsw_128, 1>;
-
 defm PMADDWD : PDI_binop_rm_int<0xF5, "pmaddwd", int_x86_sse2_pmadd_wd, 1>;
 
 defm PAVGB  : PDI_binop_rm_int<0xE0, "pavgb", int_x86_sse2_pavg_b, 1>;
@@ -1391,14 +1544,15 @@
 defm PSRAD : PDI_binop_rmi_int<0xE2, 0x72, MRM4r, "psrad", int_x86_sse2_psra_d>;
 // PSRAQ doesn't exist in SSE[1-3].
 
-
 // 128-bit logical shifts.
 let isTwoAddress = 1 in {
-def PSLLDQri : PDIi8<0x73, MRM7r, (ops VR128:$dst, VR128:$src1, i32i8imm:$src2),
-                     "pslldq {$src2, $dst|$dst, $src2}", []>;
-def PSRLDQri : PDIi8<0x73, MRM3r, (ops VR128:$dst, VR128:$src1, i32i8imm:$src2),
-                     "psrldq {$src2, $dst|$dst, $src2}", []>;
-// PSRADQri doesn't exist in SSE[1-3].
+  def PSLLDQri : PDIi8<0x73, MRM7r,
+                       (ops VR128:$dst, VR128:$src1, i32i8imm:$src2),
+                       "pslldq {$src2, $dst|$dst, $src2}", []>;
+  def PSRLDQri : PDIi8<0x73, MRM3r,
+                       (ops VR128:$dst, VR128:$src1, i32i8imm:$src2),
+                       "psrldq {$src2, $dst|$dst, $src2}", []>;
+  // PSRADQri doesn't exist in SSE[1-3].
 }
 
 let Predicates = [HasSSE2] in {
@@ -1416,24 +1570,26 @@
 defm PXOR : PDI_binop_rm_v2i64<0xEF, "pxor", xor, 1>;
 
 let isTwoAddress = 1 in {
-def PANDNrr : PDI<0xDF, MRMSrcReg, (ops VR128:$dst, VR128:$src1, VR128:$src2),
-                  "pandn {$src2, $dst|$dst, $src2}",
-                  [(set VR128:$dst, (v2i64 (and (vnot VR128:$src1),
-                                            VR128:$src2)))]>;
-
-def PANDNrm : PDI<0xDF, MRMSrcMem, (ops VR128:$dst, VR128:$src1, i128mem:$src2),
-                 "pandn {$src2, $dst|$dst, $src2}",
-                 [(set VR128:$dst, (v2i64 (and (vnot VR128:$src1),
-                                           (load addr:$src2))))]>;
+  def PANDNrr : PDI<0xDF, MRMSrcReg,
+                    (ops VR128:$dst, VR128:$src1, VR128:$src2),
+                    "pandn {$src2, $dst|$dst, $src2}",
+                    [(set VR128:$dst, (v2i64 (and (vnot VR128:$src1),
+                                              VR128:$src2)))]>;
+
+  def PANDNrm : PDI<0xDF, MRMSrcMem,
+                    (ops VR128:$dst, VR128:$src1, i128mem:$src2),
+                    "pandn {$src2, $dst|$dst, $src2}",
+                    [(set VR128:$dst, (v2i64 (and (vnot VR128:$src1),
+                                              (load addr:$src2))))]>;
 }
 
 // SSE2 Integer comparison
-defm PCMPEQB : PDI_binop_rm_int<0x74, "pcmpeqb", int_x86_sse2_pcmpeq_b>;
-defm PCMPEQW : PDI_binop_rm_int<0x75, "pcmpeqw", int_x86_sse2_pcmpeq_w>;
-defm PCMPEQD : PDI_binop_rm_int<0x76, "pcmpeqd", int_x86_sse2_pcmpeq_d>;
-defm PCMPGTB : PDI_binop_rm_int<0x64, "pcmpgtb", int_x86_sse2_pcmpgt_b>;
-defm PCMPGTW : PDI_binop_rm_int<0x65, "pcmpgtw", int_x86_sse2_pcmpgt_w>;
-defm PCMPGTD : PDI_binop_rm_int<0x66, "pcmpgtd", int_x86_sse2_pcmpgt_d>;
+defm PCMPEQB  : PDI_binop_rm_int<0x74, "pcmpeqb", int_x86_sse2_pcmpeq_b>;
+defm PCMPEQW  : PDI_binop_rm_int<0x75, "pcmpeqw", int_x86_sse2_pcmpeq_w>;
+defm PCMPEQD  : PDI_binop_rm_int<0x76, "pcmpeqd", int_x86_sse2_pcmpeq_d>;
+defm PCMPGTB  : PDI_binop_rm_int<0x64, "pcmpgtb", int_x86_sse2_pcmpgt_b>;
+defm PCMPGTW  : PDI_binop_rm_int<0x65, "pcmpgtw", int_x86_sse2_pcmpgt_w>;
+defm PCMPGTD  : PDI_binop_rm_int<0x66, "pcmpgtd", int_x86_sse2_pcmpgt_d>;
 
 // Pack instructions
 defm PACKSSWB : PDI_binop_rm_int<0x63, "packsswb", int_x86_sse2_packsswb_128>;
@@ -1489,112 +1645,113 @@
                                               PSHUFLW_shuffle_mask:$src2)))]>,
                 XD, Requires<[HasSSE2]>;
 
-let isTwoAddress = 1 in {
-def PUNPCKLBWrr : PDI<0x60, MRMSrcReg, 
-                      (ops VR128:$dst, VR128:$src1, VR128:$src2),
-                      "punpcklbw {$src2, $dst|$dst, $src2}",
-                      [(set VR128:$dst,
-                        (v16i8 (vector_shuffle VR128:$src1, VR128:$src2,
-                                UNPCKL_shuffle_mask)))]>;
-def PUNPCKLBWrm : PDI<0x60, MRMSrcMem, 
-                      (ops VR128:$dst, VR128:$src1, i128mem:$src2),
-                      "punpcklbw {$src2, $dst|$dst, $src2}",
-                      [(set VR128:$dst,
-                        (v16i8 (vector_shuffle VR128:$src1,
-                                (bc_v16i8 (loadv2i64 addr:$src2)),
-                                UNPCKL_shuffle_mask)))]>;
-def PUNPCKLWDrr : PDI<0x61, MRMSrcReg, 
-                      (ops VR128:$dst, VR128:$src1, VR128:$src2),
-                      "punpcklwd {$src2, $dst|$dst, $src2}",
-                      [(set VR128:$dst,
-                        (v8i16 (vector_shuffle VR128:$src1, VR128:$src2,
-                                UNPCKL_shuffle_mask)))]>;
-def PUNPCKLWDrm : PDI<0x61, MRMSrcMem, 
-                      (ops VR128:$dst, VR128:$src1, i128mem:$src2),
-                      "punpcklwd {$src2, $dst|$dst, $src2}",
-                      [(set VR128:$dst,
-                        (v8i16 (vector_shuffle VR128:$src1,
-                                (bc_v8i16 (loadv2i64 addr:$src2)),
-                                UNPCKL_shuffle_mask)))]>;
-def PUNPCKLDQrr : PDI<0x62, MRMSrcReg, 
-                      (ops VR128:$dst, VR128:$src1, VR128:$src2),
-                      "punpckldq {$src2, $dst|$dst, $src2}",
-                      [(set VR128:$dst,
-                        (v4i32 (vector_shuffle VR128:$src1, VR128:$src2,
-                                UNPCKL_shuffle_mask)))]>;
-def PUNPCKLDQrm : PDI<0x62, MRMSrcMem, 
-                      (ops VR128:$dst, VR128:$src1, i128mem:$src2),
-                      "punpckldq {$src2, $dst|$dst, $src2}",
-                      [(set VR128:$dst,
-                        (v4i32 (vector_shuffle VR128:$src1,
-                                (bc_v4i32 (loadv2i64 addr:$src2)),
-                                UNPCKL_shuffle_mask)))]>;
-def PUNPCKLQDQrr : PDI<0x6C, MRMSrcReg, 
-                       (ops VR128:$dst, VR128:$src1, VR128:$src2),
-                       "punpcklqdq {$src2, $dst|$dst, $src2}",
-                      [(set VR128:$dst,
-                        (v2i64 (vector_shuffle VR128:$src1, VR128:$src2,
-                                UNPCKL_shuffle_mask)))]>;
-def PUNPCKLQDQrm : PDI<0x6C, MRMSrcMem, 
-                       (ops VR128:$dst, VR128:$src1, i128mem:$src2),
-                       "punpcklqdq {$src2, $dst|$dst, $src2}",
-                      [(set VR128:$dst,
-                        (v2i64 (vector_shuffle VR128:$src1,
-                                (loadv2i64 addr:$src2),
-                                UNPCKL_shuffle_mask)))]>;
 
-def PUNPCKHBWrr : PDI<0x68, MRMSrcReg, 
-                      (ops VR128:$dst, VR128:$src1, VR128:$src2),
-                      "punpckhbw {$src2, $dst|$dst, $src2}",
-                      [(set VR128:$dst,
-                        (v16i8 (vector_shuffle VR128:$src1, VR128:$src2,
-                                UNPCKH_shuffle_mask)))]>;
-def PUNPCKHBWrm : PDI<0x68, MRMSrcMem, 
-                      (ops VR128:$dst, VR128:$src1, i128mem:$src2),
-                      "punpckhbw {$src2, $dst|$dst, $src2}",
-                      [(set VR128:$dst,
-                        (v16i8 (vector_shuffle VR128:$src1,
-                                (bc_v16i8 (loadv2i64 addr:$src2)),
-                                UNPCKH_shuffle_mask)))]>;
-def PUNPCKHWDrr : PDI<0x69, MRMSrcReg, 
-                      (ops VR128:$dst, VR128:$src1, VR128:$src2),
-                      "punpckhwd {$src2, $dst|$dst, $src2}",
-                      [(set VR128:$dst,
-                        (v8i16 (vector_shuffle VR128:$src1, VR128:$src2,
-                                UNPCKH_shuffle_mask)))]>;
-def PUNPCKHWDrm : PDI<0x69, MRMSrcMem, 
-                      (ops VR128:$dst, VR128:$src1, i128mem:$src2),
-                      "punpckhwd {$src2, $dst|$dst, $src2}",
-                      [(set VR128:$dst,
-                        (v8i16 (vector_shuffle VR128:$src1,
-                                (bc_v8i16 (loadv2i64 addr:$src2)),
-                                UNPCKH_shuffle_mask)))]>;
-def PUNPCKHDQrr : PDI<0x6A, MRMSrcReg, 
-                      (ops VR128:$dst, VR128:$src1, VR128:$src2),
-                      "punpckhdq {$src2, $dst|$dst, $src2}",
-                      [(set VR128:$dst,
-                        (v4i32 (vector_shuffle VR128:$src1, VR128:$src2,
-                                UNPCKH_shuffle_mask)))]>;
-def PUNPCKHDQrm : PDI<0x6A, MRMSrcMem, 
-                      (ops VR128:$dst, VR128:$src1, i128mem:$src2),
-                      "punpckhdq {$src2, $dst|$dst, $src2}",
-                      [(set VR128:$dst,
-                        (v4i32 (vector_shuffle VR128:$src1,
-                                (bc_v4i32 (loadv2i64 addr:$src2)),
-                                UNPCKH_shuffle_mask)))]>;
-def PUNPCKHQDQrr : PDI<0x6D, MRMSrcReg, 
-                       (ops VR128:$dst, VR128:$src1, VR128:$src2),
-                       "punpckhqdq {$src2, $dst|$dst, $src2}",
-                      [(set VR128:$dst,
-                        (v2i64 (vector_shuffle VR128:$src1, VR128:$src2,
-                                UNPCKH_shuffle_mask)))]>;
-def PUNPCKHQDQrm : PDI<0x6D, MRMSrcMem, 
-                      (ops VR128:$dst, VR128:$src1, i128mem:$src2),
-                      "punpckhqdq {$src2, $dst|$dst, $src2}",
-                      [(set VR128:$dst,
-                        (v2i64 (vector_shuffle VR128:$src1,
-                                (loadv2i64 addr:$src2),
-                                UNPCKH_shuffle_mask)))]>;
+let isTwoAddress = 1 in {
+  def PUNPCKLBWrr : PDI<0x60, MRMSrcReg, 
+                        (ops VR128:$dst, VR128:$src1, VR128:$src2),
+                        "punpcklbw {$src2, $dst|$dst, $src2}",
+                        [(set VR128:$dst,
+                          (v16i8 (vector_shuffle VR128:$src1, VR128:$src2,
+                                  UNPCKL_shuffle_mask)))]>;
+  def PUNPCKLBWrm : PDI<0x60, MRMSrcMem, 
+                        (ops VR128:$dst, VR128:$src1, i128mem:$src2),
+                        "punpcklbw {$src2, $dst|$dst, $src2}",
+                        [(set VR128:$dst,
+                          (v16i8 (vector_shuffle VR128:$src1,
+                                  (bc_v16i8 (loadv2i64 addr:$src2)),
+                                  UNPCKL_shuffle_mask)))]>;
+  def PUNPCKLWDrr : PDI<0x61, MRMSrcReg, 
+                        (ops VR128:$dst, VR128:$src1, VR128:$src2),
+                        "punpcklwd {$src2, $dst|$dst, $src2}",
+                        [(set VR128:$dst,
+                          (v8i16 (vector_shuffle VR128:$src1, VR128:$src2,
+                                  UNPCKL_shuffle_mask)))]>;
+  def PUNPCKLWDrm : PDI<0x61, MRMSrcMem, 
+                        (ops VR128:$dst, VR128:$src1, i128mem:$src2),
+                        "punpcklwd {$src2, $dst|$dst, $src2}",
+                        [(set VR128:$dst,
+                          (v8i16 (vector_shuffle VR128:$src1,
+                                  (bc_v8i16 (loadv2i64 addr:$src2)),
+                                  UNPCKL_shuffle_mask)))]>;
+  def PUNPCKLDQrr : PDI<0x62, MRMSrcReg, 
+                        (ops VR128:$dst, VR128:$src1, VR128:$src2),
+                        "punpckldq {$src2, $dst|$dst, $src2}",
+                        [(set VR128:$dst,
+                          (v4i32 (vector_shuffle VR128:$src1, VR128:$src2,
+                                  UNPCKL_shuffle_mask)))]>;
+  def PUNPCKLDQrm : PDI<0x62, MRMSrcMem, 
+                        (ops VR128:$dst, VR128:$src1, i128mem:$src2),
+                        "punpckldq {$src2, $dst|$dst, $src2}",
+                        [(set VR128:$dst,
+                          (v4i32 (vector_shuffle VR128:$src1,
+                                  (bc_v4i32 (loadv2i64 addr:$src2)),
+                                  UNPCKL_shuffle_mask)))]>;
+  def PUNPCKLQDQrr : PDI<0x6C, MRMSrcReg, 
+                         (ops VR128:$dst, VR128:$src1, VR128:$src2),
+                         "punpcklqdq {$src2, $dst|$dst, $src2}",
+                        [(set VR128:$dst,
+                          (v2i64 (vector_shuffle VR128:$src1, VR128:$src2,
+                                  UNPCKL_shuffle_mask)))]>;
+  def PUNPCKLQDQrm : PDI<0x6C, MRMSrcMem, 
+                         (ops VR128:$dst, VR128:$src1, i128mem:$src2),
+                         "punpcklqdq {$src2, $dst|$dst, $src2}",
+                        [(set VR128:$dst,
+                          (v2i64 (vector_shuffle VR128:$src1,
+                                  (loadv2i64 addr:$src2),
+                                  UNPCKL_shuffle_mask)))]>;
+  
+  def PUNPCKHBWrr : PDI<0x68, MRMSrcReg, 
+                        (ops VR128:$dst, VR128:$src1, VR128:$src2),
+                        "punpckhbw {$src2, $dst|$dst, $src2}",
+                        [(set VR128:$dst,
+                          (v16i8 (vector_shuffle VR128:$src1, VR128:$src2,
+                                  UNPCKH_shuffle_mask)))]>;
+  def PUNPCKHBWrm : PDI<0x68, MRMSrcMem, 
+                        (ops VR128:$dst, VR128:$src1, i128mem:$src2),
+                        "punpckhbw {$src2, $dst|$dst, $src2}",
+                        [(set VR128:$dst,
+                          (v16i8 (vector_shuffle VR128:$src1,
+                                  (bc_v16i8 (loadv2i64 addr:$src2)),
+                                  UNPCKH_shuffle_mask)))]>;
+  def PUNPCKHWDrr : PDI<0x69, MRMSrcReg, 
+                        (ops VR128:$dst, VR128:$src1, VR128:$src2),
+                        "punpckhwd {$src2, $dst|$dst, $src2}",
+                        [(set VR128:$dst,
+                          (v8i16 (vector_shuffle VR128:$src1, VR128:$src2,
+                                  UNPCKH_shuffle_mask)))]>;
+  def PUNPCKHWDrm : PDI<0x69, MRMSrcMem, 
+                        (ops VR128:$dst, VR128:$src1, i128mem:$src2),
+                        "punpckhwd {$src2, $dst|$dst, $src2}",
+                        [(set VR128:$dst,
+                          (v8i16 (vector_shuffle VR128:$src1,
+                                  (bc_v8i16 (loadv2i64 addr:$src2)),
+                                  UNPCKH_shuffle_mask)))]>;
+  def PUNPCKHDQrr : PDI<0x6A, MRMSrcReg, 
+                        (ops VR128:$dst, VR128:$src1, VR128:$src2),
+                        "punpckhdq {$src2, $dst|$dst, $src2}",
+                        [(set VR128:$dst,
+                          (v4i32 (vector_shuffle VR128:$src1, VR128:$src2,
+                                  UNPCKH_shuffle_mask)))]>;
+  def PUNPCKHDQrm : PDI<0x6A, MRMSrcMem, 
+                        (ops VR128:$dst, VR128:$src1, i128mem:$src2),
+                        "punpckhdq {$src2, $dst|$dst, $src2}",
+                        [(set VR128:$dst,
+                          (v4i32 (vector_shuffle VR128:$src1,
+                                  (bc_v4i32 (loadv2i64 addr:$src2)),
+                                  UNPCKH_shuffle_mask)))]>;
+  def PUNPCKHQDQrr : PDI<0x6D, MRMSrcReg, 
+                         (ops VR128:$dst, VR128:$src1, VR128:$src2),
+                         "punpckhqdq {$src2, $dst|$dst, $src2}",
+                        [(set VR128:$dst,
+                          (v2i64 (vector_shuffle VR128:$src1, VR128:$src2,
+                                  UNPCKH_shuffle_mask)))]>;
+  def PUNPCKHQDQrm : PDI<0x6D, MRMSrcMem, 
+                        (ops VR128:$dst, VR128:$src1, i128mem:$src2),
+                        "punpckhqdq {$src2, $dst|$dst, $src2}",
+                        [(set VR128:$dst,
+                          (v2i64 (vector_shuffle VR128:$src1,
+                                  (loadv2i64 addr:$src2),
+                                  UNPCKH_shuffle_mask)))]>;
 }
 
 // Extract / Insert
@@ -1604,32 +1761,24 @@
                     [(set GR32:$dst, (X86pextrw (v8i16 VR128:$src1),
                                      (iPTR imm:$src2)))]>;
 let isTwoAddress = 1 in {
-def PINSRWrri : PDIi8<0xC4, MRMSrcReg,
-                     (ops VR128:$dst, VR128:$src1, GR32:$src2, i32i8imm:$src3),
-                     "pinsrw {$src3, $src2, $dst|$dst, $src2, $src3}",
-                     [(set VR128:$dst, (v8i16 (X86pinsrw (v8i16 VR128:$src1),
-                                               GR32:$src2, (iPTR imm:$src3))))]>;
-def PINSRWrmi : PDIi8<0xC4, MRMSrcMem,
-                     (ops VR128:$dst, VR128:$src1, i16mem:$src2, i32i8imm:$src3),
-                     "pinsrw {$src3, $src2, $dst|$dst, $src2, $src3}",
-                     [(set VR128:$dst,
-                       (v8i16 (X86pinsrw (v8i16 VR128:$src1),
-                               (i32 (anyext (loadi16 addr:$src2))),
-                               (iPTR imm:$src3))))]>;
+  def PINSRWrri : PDIi8<0xC4, MRMSrcReg,
+                       (ops VR128:$dst, VR128:$src1,
+                        GR32:$src2, i32i8imm:$src3),
+                       "pinsrw {$src3, $src2, $dst|$dst, $src2, $src3}",
+                       [(set VR128:$dst,
+                         (v8i16 (X86pinsrw (v8i16 VR128:$src1),
+                                 GR32:$src2, (iPTR imm:$src3))))]>;
+  def PINSRWrmi : PDIi8<0xC4, MRMSrcMem,
+                       (ops VR128:$dst, VR128:$src1,
+                        i16mem:$src2, i32i8imm:$src3),
+                       "pinsrw {$src3, $src2, $dst|$dst, $src2, $src3}",
+                       [(set VR128:$dst,
+                         (v8i16 (X86pinsrw (v8i16 VR128:$src1),
+                                 (i32 (anyext (loadi16 addr:$src2))),
+                                 (iPTR imm:$src3))))]>;
 }
 
-//===----------------------------------------------------------------------===//
-// Miscellaneous Instructions
-//===----------------------------------------------------------------------===//
-
 // Mask creation
-def MOVMSKPSrr : PSI<0x50, MRMSrcReg, (ops GR32:$dst, VR128:$src),
-                     "movmskps {$src, $dst|$dst, $src}",
-                     [(set GR32:$dst, (int_x86_sse_movmsk_ps VR128:$src))]>;
-def MOVMSKPDrr : PSI<0x50, MRMSrcReg, (ops GR32:$dst, VR128:$src),
-                     "movmskpd {$src, $dst|$dst, $src}",
-                     [(set GR32:$dst, (int_x86_sse2_movmsk_pd VR128:$src))]>;
-
 def PMOVMSKBrr : PDI<0xD7, MRMSrcReg, (ops GR32:$dst, VR128:$src),
                      "pmovmskb {$src, $dst|$dst, $src}",
                      [(set GR32:$dst, (int_x86_sse2_pmovmskb_128 VR128:$src))]>;
@@ -1640,17 +1789,7 @@
                      [(int_x86_sse2_maskmov_dqu VR128:$src, VR128:$mask, EDI)]>,
                  Imp<[EDI],[]>;
 
-// Prefetching loads.
-// TODO: no intrinsics for these?
-def PREFETCHT0   : PSI<0x18, MRM1m, (ops i8mem:$src), "prefetcht0 $src", []>;
-def PREFETCHT1   : PSI<0x18, MRM2m, (ops i8mem:$src), "prefetcht1 $src", []>;
-def PREFETCHT2   : PSI<0x18, MRM3m, (ops i8mem:$src), "prefetcht2 $src", []>;
-def PREFETCHNTA  : PSI<0x18, MRM0m, (ops i8mem:$src), "prefetchnta $src", []>;
-
 // Non-temporal stores
-def MOVNTPSmr : PSI<0x2B, MRMDestMem, (ops i128mem:$dst, VR128:$src),
-                    "movntps {$src, $dst|$dst, $src}",
-                    [(int_x86_sse_movnt_ps addr:$dst, VR128:$src)]>;
 def MOVNTPDmr : PDI<0x2B, MRMDestMem, (ops i128mem:$dst, VR128:$src),
                     "movntpd {$src, $dst|$dst, $src}",
                     [(int_x86_sse2_movnt_pd addr:$dst, VR128:$src)]>;
@@ -1668,49 +1807,20 @@
               TB, Requires<[HasSSE2]>;
 
 // Load, store, and memory fence
-def SFENCE : PSI<0xAE, MRM7m, (ops), "sfence", [(int_x86_sse_sfence)]>;
 def LFENCE : I<0xAE, MRM5m, (ops),
                "lfence", [(int_x86_sse2_lfence)]>, TB, Requires<[HasSSE2]>;
 def MFENCE : I<0xAE, MRM6m, (ops),
                "mfence", [(int_x86_sse2_mfence)]>, TB, Requires<[HasSSE2]>;
 
-// MXCSR register
-def LDMXCSR : PSI<0xAE, MRM2m, (ops i32mem:$src),
-                  "ldmxcsr $src", [(int_x86_sse_ldmxcsr addr:$src)]>;
-def STMXCSR : PSI<0xAE, MRM3m, (ops i32mem:$dst),
-                  "stmxcsr $dst", [(int_x86_sse_stmxcsr addr:$dst)]>;
-
-// Thread synchronization
-def MONITOR : I<0xC8, RawFrm, (ops), "monitor",
-                [(int_x86_sse3_monitor EAX, ECX, EDX)]>,TB, Requires<[HasSSE3]>;
-def MWAIT   : I<0xC9, RawFrm, (ops), "mwait",
-                [(int_x86_sse3_mwait ECX, EAX)]>, TB, Requires<[HasSSE3]>;
-
-//===----------------------------------------------------------------------===//
-// Alias Instructions
-//===----------------------------------------------------------------------===//
 
 // Alias instructions that map zero vector to pxor / xorp* for sse.
 // FIXME: remove when we can teach regalloc that xor reg, reg is ok.
-let isReMaterializable = 1 in {
-def V_SET0 : PSI<0x57, MRMInitReg, (ops VR128:$dst),
-                 "xorps $dst, $dst",
-                 [(set VR128:$dst, (v4f32 immAllZerosV))]>;
-
-def V_SETALLONES : PDI<0x76, MRMInitReg, (ops VR128:$dst),
-                       "pcmpeqd $dst, $dst",
-                       [(set VR128:$dst, (v2f64 immAllOnesV))]>;
-}
+let isReMaterializable = 1 in
+  def V_SETALLONES : PDI<0x76, MRMInitReg, (ops VR128:$dst),
+                         "pcmpeqd $dst, $dst",
+                         [(set VR128:$dst, (v2f64 immAllOnesV))]>;
 
-// FR32 / FR64 to 128-bit vector conversion.
-def MOVSS2PSrr : SSI<0x10, MRMSrcReg, (ops VR128:$dst, FR32:$src),
-                      "movss {$src, $dst|$dst, $src}",
-                      [(set VR128:$dst,
-                        (v4f32 (scalar_to_vector FR32:$src)))]>;
-def MOVSS2PSrm : SSI<0x10, MRMSrcMem, (ops VR128:$dst, f32mem:$src),
-                     "movss {$src, $dst|$dst, $src}",
-                     [(set VR128:$dst,
-                       (v4f32 (scalar_to_vector (loadf32 addr:$src))))]>;
+// FR64 to 128-bit vector conversion.
 def MOVSD2PDrr : SDI<0x10, MRMSrcReg, (ops VR128:$dst, FR64:$src),
                       "movsd {$src, $dst|$dst, $src}",
                       [(set VR128:$dst,
@@ -1753,14 +1863,6 @@
 // like this:
 // def : Pat<(f32 (vector_extract (v4f32 VR128:$src), (iPTR 0))),
 //           (f32 FR32:$src)>;
-def MOVPS2SSrr : SSI<0x10, MRMSrcReg, (ops FR32:$dst, VR128:$src),
-                     "movss {$src, $dst|$dst, $src}",
-                     [(set FR32:$dst, (vector_extract (v4f32 VR128:$src),
-                                       (iPTR 0)))]>;
-def MOVPS2SSmr : SSI<0x11, MRMDestMem, (ops f32mem:$dst, VR128:$src),
-                     "movss {$src, $dst|$dst, $src}",
-                     [(store (f32 (vector_extract (v4f32 VR128:$src),
-                                   (iPTR 0))), addr:$dst)]>;
 def MOVPD2SDrr : SDI<0x10, MRMSrcReg, (ops FR64:$dst, VR128:$src),
                      "movsd {$src, $dst|$dst, $src}",
                      [(set FR64:$dst, (vector_extract (v2f64 VR128:$src),
@@ -1789,23 +1891,17 @@
 // Move to lower bits of a VR128, leaving upper bits alone.
 // Three operand (but two address) aliases.
 let isTwoAddress = 1 in {
-def MOVLSS2PSrr : SSI<0x10, MRMSrcReg, (ops VR128:$dst, VR128:$src1, FR32:$src2),
-                      "movss {$src2, $dst|$dst, $src2}", []>;
-def MOVLSD2PDrr : SDI<0x10, MRMSrcReg, (ops VR128:$dst, VR128:$src1, FR64:$src2),
-                      "movsd {$src2, $dst|$dst, $src2}", []>;
+  def MOVLSD2PDrr : SDI<0x10, MRMSrcReg,
+                        (ops VR128:$dst, VR128:$src1, FR64:$src2),
+                        "movsd {$src2, $dst|$dst, $src2}", []>;
 
-let AddedComplexity = 15 in {
-def MOVLPSrr : SSI<0x10, MRMSrcReg, (ops VR128:$dst, VR128:$src1, VR128:$src2),
-                      "movss {$src2, $dst|$dst, $src2}",
-                   [(set VR128:$dst,
-                     (v4f32 (vector_shuffle VR128:$src1, VR128:$src2,
-                             MOVL_shuffle_mask)))]>;
-def MOVLPDrr : SDI<0x10, MRMSrcReg, (ops VR128:$dst, VR128:$src1, VR128:$src2),
-                      "movsd {$src2, $dst|$dst, $src2}",
-                   [(set VR128:$dst,
-                     (v2f64 (vector_shuffle VR128:$src1, VR128:$src2,
-                             MOVL_shuffle_mask)))]>;
-}
+  let AddedComplexity = 15 in
+    def MOVLPDrr : SDI<0x10, MRMSrcReg,
+                       (ops VR128:$dst, VR128:$src1, VR128:$src2),
+                       "movsd {$src2, $dst|$dst, $src2}",
+                       [(set VR128:$dst,
+                         (v2f64 (vector_shuffle VR128:$src1, VR128:$src2,
+                                 MOVL_shuffle_mask)))]>;
 }
 
 // Store / copy lower 64-bits of a XMM register.
@@ -1815,31 +1911,31 @@
 
 // Move to lower bits of a VR128 and zeroing upper bits.
 // Loading from memory automatically zeroing upper bits.
-let AddedComplexity = 20 in {
-def MOVZSS2PSrm : SSI<0x10, MRMSrcMem, (ops VR128:$dst, f32mem:$src),
-                      "movss {$src, $dst|$dst, $src}",
-                      [(set VR128:$dst, (v4f32 (vector_shuffle immAllZerosV,
-                                 (v4f32 (scalar_to_vector (loadf32 addr:$src))),
-                                                MOVL_shuffle_mask)))]>;
-def MOVZSD2PDrm : SDI<0x10, MRMSrcMem, (ops VR128:$dst, f64mem:$src),
-                      "movsd {$src, $dst|$dst, $src}",
-                      [(set VR128:$dst, (v2f64 (vector_shuffle immAllZerosV,
-                                 (v2f64 (scalar_to_vector (loadf64 addr:$src))),
-                                                MOVL_shuffle_mask)))]>;
-}
+let AddedComplexity = 20 in
+  def MOVZSD2PDrm : SDI<0x10, MRMSrcMem, (ops VR128:$dst, f64mem:$src),
+                        "movsd {$src, $dst|$dst, $src}",
+                        [(set VR128:$dst,
+                          (v2f64 (vector_shuffle immAllZerosV,
+                                  (v2f64 (scalar_to_vector
+                                          (loadf64 addr:$src))),
+                                  MOVL_shuffle_mask)))]>;
+
 let AddedComplexity = 15 in
 // movd / movq to XMM register zero-extends
 def MOVZDI2PDIrr : PDI<0x6E, MRMSrcReg, (ops VR128:$dst, GR32:$src),
                        "movd {$src, $dst|$dst, $src}",
-                      [(set VR128:$dst, (v4i32 (vector_shuffle immAllZerosV,
-                                           (v4i32 (scalar_to_vector GR32:$src)),
-                                                MOVL_shuffle_mask)))]>;
+                       [(set VR128:$dst,
+                         (v4i32 (vector_shuffle immAllZerosV,
+                                 (v4i32 (scalar_to_vector GR32:$src)),
+                                 MOVL_shuffle_mask)))]>;
 let AddedComplexity = 20 in
 def MOVZDI2PDIrm : PDI<0x6E, MRMSrcMem, (ops VR128:$dst, i32mem:$src),
                        "movd {$src, $dst|$dst, $src}",
-                      [(set VR128:$dst, (v4i32 (vector_shuffle immAllZerosV,
+                       [(set VR128:$dst,
+                         (v4i32 (vector_shuffle immAllZerosV,
                                  (v4i32 (scalar_to_vector (loadi32 addr:$src))),
-                                                MOVL_shuffle_mask)))]>;
+                                 MOVL_shuffle_mask)))]>;
+
 // Moving from XMM to XMM but still clear upper 64 bits.
 let AddedComplexity = 15 in
 def MOVZQI2PQIrr : I<0x7E, MRMSrcReg, (ops VR128:$dst, VR128:$src),
@@ -1849,10 +1945,181 @@
 let AddedComplexity = 20 in
 def MOVZQI2PQIrm : I<0x7E, MRMSrcMem, (ops VR128:$dst, i64mem:$src),
                      "movq {$src, $dst|$dst, $src}",
-                   [(set VR128:$dst, (int_x86_sse2_movl_dq
-                                      (bitconvert (loadv2i64 addr:$src))))]>,
+                     [(set VR128:$dst, (int_x86_sse2_movl_dq
+                                        (bitconvert (loadv2i64 addr:$src))))]>,
                    XS, Requires<[HasSSE2]>;
 
+
+//===----------------------------------------------------------------------===//
+// SSE3 Instructions
+//===----------------------------------------------------------------------===//
+
+// SSE3 Instruction Templates:
+// 
+//   S3I   - SSE3 instructions with TB and OpSize prefixes.
+//   S3SI  - SSE3 instructions with XS prefix.
+//   S3DI  - SSE3 instructions with XD prefix.
+
+class S3SI o, Format F, dag ops, string asm, list pattern>
+      : I, XS, Requires<[HasSSE3]>;
+class S3DI o, Format F, dag ops, string asm, list pattern>
+      : I, XD, Requires<[HasSSE3]>;
+class S3I o, Format F, dag ops, string asm, list pattern>
+      : I, TB, OpSize, Requires<[HasSSE3]>;
+
+// Move Instructions
+def MOVSHDUPrr : S3SI<0x16, MRMSrcReg, (ops VR128:$dst, VR128:$src),
+                      "movshdup {$src, $dst|$dst, $src}",
+                      [(set VR128:$dst, (v4f32 (vector_shuffle
+                                                VR128:$src, (undef),
+                                                MOVSHDUP_shuffle_mask)))]>;
+def MOVSHDUPrm : S3SI<0x16, MRMSrcMem, (ops VR128:$dst, f128mem:$src),
+                      "movshdup {$src, $dst|$dst, $src}",
+                      [(set VR128:$dst, (v4f32 (vector_shuffle
+                                                (loadv4f32 addr:$src), (undef),
+                                                MOVSHDUP_shuffle_mask)))]>;
+
+def MOVSLDUPrr : S3SI<0x12, MRMSrcReg, (ops VR128:$dst, VR128:$src),
+                      "movsldup {$src, $dst|$dst, $src}",
+                      [(set VR128:$dst, (v4f32 (vector_shuffle
+                                                VR128:$src, (undef),
+                                                MOVSLDUP_shuffle_mask)))]>;
+def MOVSLDUPrm : S3SI<0x12, MRMSrcMem, (ops VR128:$dst, f128mem:$src),
+                      "movsldup {$src, $dst|$dst, $src}",
+                      [(set VR128:$dst, (v4f32 (vector_shuffle
+                                                (loadv4f32 addr:$src), (undef),
+                                                MOVSLDUP_shuffle_mask)))]>;
+
+def MOVDDUPrr  : S3DI<0x12, MRMSrcReg, (ops VR128:$dst, VR128:$src),
+                      "movddup {$src, $dst|$dst, $src}",
+                      [(set VR128:$dst, (v2f64 (vector_shuffle
+                                                VR128:$src, (undef),
+                                                SSE_splat_lo_mask)))]>;
+def MOVDDUPrm  : S3DI<0x12, MRMSrcMem, (ops VR128:$dst, f64mem:$src),
+                      "movddup {$src, $dst|$dst, $src}",
+                      [(set VR128:$dst,
+                        (v2f64 (vector_shuffle
+                                (scalar_to_vector (loadf64 addr:$src)),
+                                (undef),
+                                SSE_splat_lo_mask)))]>;
+
+// Arithmetic
+let isTwoAddress = 1 in {
+  def ADDSUBPSrr : S3DI<0xD0, MRMSrcReg,
+                        (ops VR128:$dst, VR128:$src1, VR128:$src2),
+                        "addsubps {$src2, $dst|$dst, $src2}",
+                        [(set VR128:$dst, (int_x86_sse3_addsub_ps VR128:$src1,
+                                           VR128:$src2))]>;
+  def ADDSUBPSrm : S3DI<0xD0, MRMSrcMem,
+                        (ops VR128:$dst, VR128:$src1, f128mem:$src2),
+                        "addsubps {$src2, $dst|$dst, $src2}",
+                        [(set VR128:$dst, (int_x86_sse3_addsub_ps VR128:$src1,
+                                           (load addr:$src2)))]>;
+  def ADDSUBPDrr : S3I<0xD0, MRMSrcReg,
+                       (ops VR128:$dst, VR128:$src1, VR128:$src2),
+                       "addsubpd {$src2, $dst|$dst, $src2}",
+                       [(set VR128:$dst, (int_x86_sse3_addsub_pd VR128:$src1,
+                                          VR128:$src2))]>;
+  def ADDSUBPDrm : S3I<0xD0, MRMSrcMem,
+                       (ops VR128:$dst, VR128:$src1, f128mem:$src2),
+                       "addsubpd {$src2, $dst|$dst, $src2}",
+                       [(set VR128:$dst, (int_x86_sse3_addsub_pd VR128:$src1,
+                                          (load addr:$src2)))]>;
+}
+
+def LDDQUrm : S3DI<0xF0, MRMSrcMem, (ops VR128:$dst, i128mem:$src),
+                   "lddqu {$src, $dst|$dst, $src}",
+                   [(set VR128:$dst, (int_x86_sse3_ldu_dq addr:$src))]>;
+
+// Horizontal ops
+class S3D_Intrr o, string OpcodeStr, Intrinsic IntId>
+  : S3DI;
+class S3D_Intrm o, string OpcodeStr, Intrinsic IntId>
+  : S3DI;
+class S3_Intrr o, string OpcodeStr, Intrinsic IntId>
+  : S3I;
+class S3_Intrm o, string OpcodeStr, Intrinsic IntId>
+  : S3I;
+
+let isTwoAddress = 1 in {
+  def HADDPSrr : S3D_Intrr<0x7C, "haddps", int_x86_sse3_hadd_ps>;
+  def HADDPSrm : S3D_Intrm<0x7C, "haddps", int_x86_sse3_hadd_ps>;
+  def HADDPDrr : S3_Intrr <0x7C, "haddpd", int_x86_sse3_hadd_pd>;
+  def HADDPDrm : S3_Intrm <0x7C, "haddpd", int_x86_sse3_hadd_pd>;
+  def HSUBPSrr : S3D_Intrr<0x7D, "hsubps", int_x86_sse3_hsub_ps>;
+  def HSUBPSrm : S3D_Intrm<0x7D, "hsubps", int_x86_sse3_hsub_ps>;
+  def HSUBPDrr : S3_Intrr <0x7D, "hsubpd", int_x86_sse3_hsub_pd>;
+  def HSUBPDrm : S3_Intrm <0x7D, "hsubpd", int_x86_sse3_hsub_pd>;
+}
+
+// Thread synchronization
+def MONITOR : I<0xC8, RawFrm, (ops), "monitor",
+                [(int_x86_sse3_monitor EAX, ECX, EDX)]>,TB, Requires<[HasSSE3]>;
+def MWAIT   : I<0xC9, RawFrm, (ops), "mwait",
+                [(int_x86_sse3_mwait ECX, EAX)]>, TB, Requires<[HasSSE3]>;
+
+// vector_shuffle v1,  <1, 1, 3, 3>
+let AddedComplexity = 15 in
+def : Pat<(v4i32 (vector_shuffle VR128:$src, (undef),
+                  MOVSHDUP_shuffle_mask)),
+          (MOVSHDUPrr VR128:$src)>, Requires<[HasSSE3]>;
+let AddedComplexity = 20 in
+def : Pat<(v4i32 (vector_shuffle (bc_v4i32 (loadv2i64 addr:$src)), (undef),
+                  MOVSHDUP_shuffle_mask)),
+          (MOVSHDUPrm addr:$src)>, Requires<[HasSSE3]>;
+
+// vector_shuffle v1,  <0, 0, 2, 2>
+let AddedComplexity = 15 in
+  def : Pat<(v4i32 (vector_shuffle VR128:$src, (undef),
+                    MOVSLDUP_shuffle_mask)),
+            (MOVSLDUPrr VR128:$src)>, Requires<[HasSSE3]>;
+let AddedComplexity = 20 in
+  def : Pat<(v4i32 (vector_shuffle (bc_v4i32 (loadv2i64 addr:$src)), (undef),
+                    MOVSLDUP_shuffle_mask)),
+            (MOVSLDUPrm addr:$src)>, Requires<[HasSSE3]>;
+
+//===----------------------------------------------------------------------===//
+// SSSE3 Instructions
+//===----------------------------------------------------------------------===//
+
+// SSE3 Instruction Templates:
+// 
+//   SS38I - SSSE3 instructions with T8 and OpSize prefixes.
+//   SS3AI - SSSE3 instructions with TA and OpSize prefixes.
+
+class SS38I o, Format F, dag ops, string asm, list pattern>
+      : I, T8, OpSize, Requires<[HasSSSE3]>;
+class SS3AI o, Format F, dag ops, string asm, list pattern>
+      : I, TA, OpSize, Requires<[HasSSSE3]>;
+
+/// SS3I_binop_rm_int - Simple SSSE3 binary operatr whose type is v2i64.
+let isTwoAddress = 1 in {
+  multiclass SS3I_binop_rm_int opc, string OpcodeStr, Intrinsic IntId,
+                               bit Commutable = 0> {
+    def rr : SS38I {
+      let isCommutable = Commutable;
+    }
+    def rm : SS38I;
+  }
+}
+
+defm PMULHRSW128 : SS3I_binop_rm_int<0x0B, "pmulhrsw",
+                                     int_x86_ssse3_pmulhrsw_128, 1>;
+
 //===----------------------------------------------------------------------===//
 // Non-Instruction Patterns
 //===----------------------------------------------------------------------===//
@@ -1999,26 +2266,6 @@
           (PUNPCKLDQrr VR128:$src, VR128:$src)>, Requires<[HasSSE1]>;
 }
 
-let AddedComplexity = 15 in
-// vector_shuffle v1,  <1, 1, 3, 3>
-def : Pat<(v4i32 (vector_shuffle VR128:$src, (undef),
-                  MOVSHDUP_shuffle_mask)),
-          (MOVSHDUPrr VR128:$src)>, Requires<[HasSSE3]>;
-let AddedComplexity = 20 in
-def : Pat<(v4i32 (vector_shuffle (bc_v4i32 (loadv2i64 addr:$src)), (undef),
-                  MOVSHDUP_shuffle_mask)),
-          (MOVSHDUPrm addr:$src)>, Requires<[HasSSE3]>;
-
-// vector_shuffle v1,  <0, 0, 2, 2>
-let AddedComplexity = 15 in
-def : Pat<(v4i32 (vector_shuffle VR128:$src, (undef),
-                  MOVSLDUP_shuffle_mask)),
-          (MOVSLDUPrr VR128:$src)>, Requires<[HasSSE3]>;
-let AddedComplexity = 20 in
-def : Pat<(v4i32 (vector_shuffle (bc_v4i32 (loadv2i64 addr:$src)), (undef),
-                  MOVSLDUP_shuffle_mask)),
-          (MOVSLDUPrm addr:$src)>, Requires<[HasSSE3]>;
-
 let AddedComplexity = 15 in {
 // vector_shuffle v1, v2 <0, 1, 4, 5> using MOVLHPS
 def : Pat<(v4i32 (vector_shuffle VR128:$src1, VR128:$src2,





From sabre at nondot.org  Wed May  2 19:16:27 2007
From: sabre at nondot.org (Chris Lattner)
Date: Wed, 2 May 2007 19:16:27 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Target/TargetOptions.h
Message-ID: <200705030016.l430GR9e028596@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Target:

TargetOptions.h updated: 1.14 -> 1.15
---
Log message:

Add a new option.


---
Diffs of the changes:  (+16 -0)

 TargetOptions.h |   16 ++++++++++++++++
 1 files changed, 16 insertions(+)


Index: llvm/include/llvm/Target/TargetOptions.h
diff -u llvm/include/llvm/Target/TargetOptions.h:1.14 llvm/include/llvm/Target/TargetOptions.h:1.15
--- llvm/include/llvm/Target/TargetOptions.h:1.14	Mon Jan 29 14:48:32 2007
+++ llvm/include/llvm/Target/TargetOptions.h	Wed May  2 19:16:07 2007
@@ -49,6 +49,22 @@
   extern bool FiniteOnlyFPMathOption;
   extern bool FiniteOnlyFPMath();
   
+  /// HonorSignDependentRoundingFPMath - This returns true when the
+  /// -enable-sign-dependent-rounding-fp-math is specified.  If this returns
+  /// false (the default), the code generator is allowed to assume that the
+  /// rounding behavior is the default (round-to-zero for all floating point to
+  /// integer conversions, and round-to-nearest for all other arithmetic
+  /// truncations).  If this is enabled (set to true), the code generator must
+  /// assume that the rounding mode may dynamically change.
+  extern bool HonorSignDependentRoundingFPMathOption;
+  extern bool HonorSignDependentRoundingFPMath();
+  
+  /// option is specified on the command line. If this returns false (default),
+  /// the code generator is not allowed to assume that FP arithmetic arguments
+  /// and results are never NaNs or +-Infs.
+  extern bool FiniteOnlyFPMathOption;
+  extern bool FiniteOnlyFPMath();
+  
   /// UseSoftFloat - This flag is enabled when the -soft-float flag is specified
   /// on the command line.  When this flag is on, the code generator will
   /// generate libcalls to the software floating point library instead of





From sabre at nondot.org  Wed May  2 19:16:30 2007
From: sabre at nondot.org (Chris Lattner)
Date: Wed, 2 May 2007 19:16:30 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/TargetMachine.cpp
Message-ID: <200705030016.l430GUE8028601@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target:

TargetMachine.cpp updated: 1.62 -> 1.63
---
Log message:

Add a new option.


---
Diffs of the changes:  (+17 -4)

 TargetMachine.cpp |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)


Index: llvm/lib/Target/TargetMachine.cpp
diff -u llvm/lib/Target/TargetMachine.cpp:1.62 llvm/lib/Target/TargetMachine.cpp:1.63
--- llvm/lib/Target/TargetMachine.cpp:1.62	Thu Apr 19 13:42:38 2007
+++ llvm/lib/Target/TargetMachine.cpp	Wed May  2 19:16:07 2007
@@ -54,20 +54,27 @@
                cl::location(UnsafeFPMath),
                cl::init(false));
   cl::opt
-  EnableFiniteOnltFPMath("enable-finite-only-fp-math",
+  EnableFiniteOnlyFPMath("enable-finite-only-fp-math",
                cl::desc("Enable optimizations that assumes non- NaNs / +-Infs"),
                cl::location(FiniteOnlyFPMathOption),
                cl::init(false));
   cl::opt
+  EnableHonorSignDependentRoundingFPMath(cl::Hidden,
+               "enable-sign-dependent-rounding-fp-math",
+       cl::desc("Force codegen to assume rounding mode can change dynamically"),
+               cl::location(HonorSignDependentRoundingFPMathOption),
+               cl::init(false));
+
+  cl::opt
   GenerateSoftFloatCalls("soft-float",
                cl::desc("Generate software floating point library calls"),
                cl::location(UseSoftFloat),
                cl::init(false));
   cl::opt
   DontPlaceZerosInBSS("nozero-initialized-in-bss",
-               cl::desc("Don't place zero-initialized symbols into bss section"),
-               cl::location(NoZerosInBSS),
-               cl::init(false));
+              cl::desc("Don't place zero-initialized symbols into bss section"),
+              cl::location(NoZerosInBSS),
+              cl::init(false));
   cl::opt
   EnableExceptionHandling("enable-eh",
                cl::desc("Exception handling should be emitted."),
@@ -146,5 +153,11 @@
   /// the code generator is not allowed to assume that FP arithmetic arguments
   /// and results are never NaNs or +-Infs.
   bool FiniteOnlyFPMath() { return UnsafeFPMath || FiniteOnlyFPMathOption; }
+  
+  /// HonorSignDependentRoundingFPMath - Return true if the codegen must assume
+  /// that the rounding mode of the FPU can change from its default.
+  bool HonorSignDependentRoundingFPMath() {
+    return !UnsafeFPMath && HonorSignDependentRoundingFPMathOption;
+  }
 }
 





From sabre at nondot.org  Wed May  2 19:27:29 2007
From: sabre at nondot.org (Chris Lattner)
Date: Wed, 2 May 2007 19:27:29 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/TargetMachine.cpp Target.td
Message-ID: <200705030027.l430RTKM028938@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target:

TargetMachine.cpp updated: 1.63 -> 1.64
Target.td updated: 1.97 -> 1.98
---
Log message:

expose HonorSignDependentRoundingFPMathOption to .td files


---
Diffs of the changes:  (+6 -0)

 Target.td         |    5 +++++
 TargetMachine.cpp |    1 +
 2 files changed, 6 insertions(+)


Index: llvm/lib/Target/TargetMachine.cpp
diff -u llvm/lib/Target/TargetMachine.cpp:1.63 llvm/lib/Target/TargetMachine.cpp:1.64
--- llvm/lib/Target/TargetMachine.cpp:1.63	Wed May  2 19:16:07 2007
+++ llvm/lib/Target/TargetMachine.cpp	Wed May  2 19:27:11 2007
@@ -27,6 +27,7 @@
   bool NoExcessFPPrecision;
   bool UnsafeFPMath;
   bool FiniteOnlyFPMathOption;
+  bool HonorSignDependentRoundingFPMathOption;
   bool UseSoftFloat;
   bool NoZerosInBSS;
   bool ExceptionHandling;


Index: llvm/lib/Target/Target.td
diff -u llvm/lib/Target/Target.td:1.97 llvm/lib/Target/Target.td:1.98
--- llvm/lib/Target/Target.td:1.97	Tue May  1 00:57:02 2007
+++ llvm/lib/Target/Target.td	Wed May  2 19:27:11 2007
@@ -210,6 +210,11 @@
   string CondString = cond;
 }
 
+/// NoHonorSignDependentRounding - This predicate is true if support for
+/// sign-dependent-rounding is not enabled.
+def NoHonorSignDependentRounding
+ : Predicate<"!HonorSignDependentRoundingFPMath()">;
+
 class Requires preds> {
   list Predicates = preds;
 }





From sabre at nondot.org  Wed May  2 19:31:57 2007
From: sabre at nondot.org (Chris Lattner)
Date: Wed, 2 May 2007 19:31:57 -0500
Subject: [llvm-commits] CVS: llvm/test/CodeGen/ARM/fnmul.ll
Message-ID: <200705030031.l430Vvxq029096@zion.cs.uiuc.edu>



Changes in directory llvm/test/CodeGen/ARM:

fnmul.ll added (r1.1)
---
Log message:

match a reassociated form of fnmul


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

 fnmul.ll |   11 +++++++++++
 1 files changed, 11 insertions(+)


Index: llvm/test/CodeGen/ARM/fnmul.ll
diff -c /dev/null llvm/test/CodeGen/ARM/fnmul.ll:1.1
*** /dev/null	Wed May  2 19:31:50 2007
--- llvm/test/CodeGen/ARM/fnmul.ll	Wed May  2 19:31:40 2007
***************
*** 0 ****
--- 1,11 ----
+ ; RUN: llvm-as < %s | llc -march=arm -mattr=+v6,+vfp2 | grep fnmuld
+ ; RUN: llvm-as < %s | llc -march=arm -mattr=+v6,+vfp2 -enable-sign-dependent-rounding-fp-math | grep fmul
+ 
+ 
+ define double @t1(double %a, double %b) {
+ entry:
+         %tmp2 = sub double -0.000000e+00, %a            ;  [#uses=1]
+         %tmp4 = mul double %tmp2, %b            ;  [#uses=1]
+         ret double %tmp4
+ }
+ 





From sabre at nondot.org  Wed May  2 19:32:17 2007
From: sabre at nondot.org (Chris Lattner)
Date: Wed, 2 May 2007 19:32:17 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp
	ARMInstrVFP.td
Message-ID: <200705030032.l430WHd9029113@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/ARM:

ARMISelDAGToDAG.cpp updated: 1.110 -> 1.111
ARMInstrVFP.td updated: 1.1 -> 1.2
---
Log message:

match a reassociated form of fnmul.  This implements CodeGen/ARM/fnmul.ll


---
Diffs of the changes:  (+9 -2)

 ARMISelDAGToDAG.cpp |    1 +
 ARMInstrVFP.td      |   10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)


Index: llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp
diff -u llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp:1.110 llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp:1.111
--- llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp:1.110	Mon Mar 19 02:48:02 2007
+++ llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp	Wed May  2 19:32:00 2007
@@ -27,6 +27,7 @@
 #include "llvm/CodeGen/SelectionDAGISel.h"
 #include "llvm/CodeGen/SSARegMap.h"
 #include "llvm/Target/TargetLowering.h"
+#include "llvm/Target/TargetOptions.h"
 #include "llvm/Support/Debug.h"
 using namespace llvm;
 


Index: llvm/lib/Target/ARM/ARMInstrVFP.td
diff -u llvm/lib/Target/ARM/ARMInstrVFP.td:1.1 llvm/lib/Target/ARM/ARMInstrVFP.td:1.2
--- llvm/lib/Target/ARM/ARMInstrVFP.td:1.1	Fri Jan 19 01:51:42 2007
+++ llvm/lib/Target/ARM/ARMInstrVFP.td	Wed May  2 19:32:00 2007
@@ -139,8 +139,7 @@
 def FMULS  : ASI<(ops SPR:$dst, SPR:$a, SPR:$b),
                  "fmuls $dst, $a, $b",
                  [(set SPR:$dst, (fmul SPR:$a, SPR:$b))]>;
-
-
+                 
 def FNMULD  : ADI<(ops DPR:$dst, DPR:$a, DPR:$b),
                   "fnmuld $dst, $a, $b",
                   [(set DPR:$dst, (fneg (fmul DPR:$a, DPR:$b)))]>;
@@ -149,6 +148,13 @@
                   "fnmuls $dst, $a, $b",
                   [(set SPR:$dst, (fneg (fmul SPR:$a, SPR:$b)))]>;
 
+// Match reassociated forms only if not sign dependent rounding.
+def : Pat<(fmul (fneg DPR:$a), DPR:$b),
+          (FNMULD DPR:$a, DPR:$b)>, Requires<[NoHonorSignDependentRounding]>;
+def : Pat<(fmul (fneg SPR:$a), SPR:$b),
+          (FNMULS SPR:$a, SPR:$b)>, Requires<[NoHonorSignDependentRounding]>;
+
+
 def FSUBD  : ADI<(ops DPR:$dst, DPR:$a, DPR:$b),
                  "fsubd $dst, $a, $b",
                  [(set DPR:$dst, (fsub DPR:$a, DPR:$b))]>;





From dpatel at apple.com  Wed May  2 19:42:40 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 19:42:40 -0500
Subject: [llvm-commits] CVS: llvm/test/FrontendObjC/2007-05-02-Strong.m
Message-ID: <200705030042.l430geFQ029269@zion.cs.uiuc.edu>



Changes in directory llvm/test/FrontendObjC:

2007-05-02-Strong.m added (r1.1)
---
Log message:

New test.


---
Diffs of the changes:  (+23 -0)

 2007-05-02-Strong.m |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+)


Index: llvm/test/FrontendObjC/2007-05-02-Strong.m
diff -c /dev/null llvm/test/FrontendObjC/2007-05-02-Strong.m:1.1
*** /dev/null	Wed May  2 19:42:32 2007
--- llvm/test/FrontendObjC/2007-05-02-Strong.m	Wed May  2 19:42:22 2007
***************
*** 0 ****
--- 1,23 ----
+ // RUN: %llvmgcc -c %s -fobjc-gc -o /dev/null
+ typedef int NSInteger;
+ typedef struct _NSRect {
+   int origin;
+   int size;
+ } NSRect;
+ 
+ __attribute__((objc_gc(strong))) NSRect *_cachedRectArray;
+ extern const NSRect NSZeroRect;
+ @interface A{
+ }
+ -(void)bar:(NSInteger *)rectCount;
+ @end
+ 
+ @implementation A 
+ 
+ -(void)bar:(NSInteger *)rectCount {
+   NSRect appendRect = NSZeroRect; 
+ 
+   _cachedRectArray[*rectCount - 1] = NSZeroRect; 
+ }
+ 
+ @end





From dpatel at apple.com  Wed May  2 20:11:10 2007
From: dpatel at apple.com (dpatel at apple.com)
Date: Wed,  2 May 2007 18:11:10 -0700 (PDT)
Subject: [llvm-commits] [126812] Fix
 http://lists.cs.uiuc.edu/pipermail/llvm-commits/
 Week-of-Mon-20070430/048922.html
Message-ID: <20070503011110.D1F45B18C01@src>

Revision: 126812
Author:   dpatel
Date:     2007-05-02 18:11:09 -0700 (Wed, 02 May 2007)

Log Message:
-----------
Fix http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20070430/048922.html

Modified Paths:
--------------
    apple-local/branches/llvm/gcc/c-typeck.c

Modified: apple-local/branches/llvm/gcc/c-typeck.c
===================================================================
--- apple-local/branches/llvm/gcc/c-typeck.c	2007-05-02 23:33:36 UTC (rev 126811)
+++ apple-local/branches/llvm/gcc/c-typeck.c	2007-05-03 01:11:09 UTC (rev 126812)
@@ -1896,8 +1896,12 @@
        * pointer, not an array.  The LLVM backend supports this use of ARRAY_REF
        * and it provides it with more information for optimization.
        */
-      return build4 (ARRAY_REF, TREE_TYPE(TREE_TYPE(ar)), ar, index,
-                     NULL_TREE, NULL_TREE);
+      {
+        tree ty = TREE_TYPE(TREE_TYPE(ar));
+        if (TREE_CODE(ty) != ARRAY_TYPE)
+          ty = TYPE_MAIN_VARIANT (ty);
+        return build4 (ARRAY_REF, ty, ar, index, NULL_TREE, NULL_TREE);
+      }
 #endif
       /* APPLE LOCAL end LLVM */
       




From dpatel at apple.com  Wed May  2 20:13:54 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 20:13:54 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Transforms/RSProfiling.h
Message-ID: <200705030113.l431DsmF029954@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Transforms:

RSProfiling.h updated: 1.4 -> 1.5
---
Log message:

Drop 'const'


---
Diffs of the changes:  (+1 -1)

 RSProfiling.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/include/llvm/Transforms/RSProfiling.h
diff -u llvm/include/llvm/Transforms/RSProfiling.h:1.4 llvm/include/llvm/Transforms/RSProfiling.h:1.5
--- llvm/include/llvm/Transforms/RSProfiling.h:1.4	Wed May  2 16:39:18 2007
+++ llvm/include/llvm/Transforms/RSProfiling.h	Wed May  2 20:11:53 2007
@@ -23,7 +23,7 @@
   /// this interface are expected to chain to other implementations, such that
   /// multiple profilers can be support simultaniously.
   struct RSProfilers : public ModulePass {
-    static const char ID; // Pass identification, replacement for typeinfo
+    static char ID; // Pass identification, replacement for typeinfo
     RSProfilers() : ModulePass((intptr_t)&ID) {}
 
     /// isProfiling - This method returns true if the value passed it was 





From dpatel at apple.com  Wed May  2 20:13:55 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 20:13:55 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/PowerPC/PPCBranchSelector.cpp
	PPCCodeEmitter.cpp
Message-ID: <200705030113.l431DtwT029969@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/PowerPC:

PPCBranchSelector.cpp updated: 1.44 -> 1.45
PPCCodeEmitter.cpp updated: 1.77 -> 1.78
---
Log message:

Drop 'const'


---
Diffs of the changes:  (+4 -4)

 PPCBranchSelector.cpp |    4 ++--
 PPCCodeEmitter.cpp    |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


Index: llvm/lib/Target/PowerPC/PPCBranchSelector.cpp
diff -u llvm/lib/Target/PowerPC/PPCBranchSelector.cpp:1.44 llvm/lib/Target/PowerPC/PPCBranchSelector.cpp:1.45
--- llvm/lib/Target/PowerPC/PPCBranchSelector.cpp:1.44	Wed May  2 16:39:19 2007
+++ llvm/lib/Target/PowerPC/PPCBranchSelector.cpp	Wed May  2 20:11:54 2007
@@ -32,7 +32,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN PPCBSel : public MachineFunctionPass {
-    static const char ID;
+    static char ID;
     PPCBSel() : MachineFunctionPass((intptr_t)&ID) {}
 
     /// BlockSizes - The sizes of the basic blocks in the function.
@@ -44,7 +44,7 @@
       return "PowerPC Branch Selector";
     }
   };
-  const char PPCBSel::ID = 0;
+  char PPCBSel::ID = 0;
 }
 
 /// createPPCBranchSelectionPass - returns an instance of the Branch Selection


Index: llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp
diff -u llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp:1.77 llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp:1.78
--- llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp:1.77	Wed May  2 16:39:19 2007
+++ llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp	Wed May  2 20:11:54 2007
@@ -40,7 +40,7 @@
     int getMachineOpValue(MachineInstr &MI, MachineOperand &MO);
 
   public:
-    static const char ID;
+    static char ID;
     PPCCodeEmitter(TargetMachine &T, MachineCodeEmitter &M)
       : MachineFunctionPass((intptr_t)&ID), TM(T), MCE(M) {}
 
@@ -64,7 +64,7 @@
     ///
     unsigned getBinaryCodeForInstr(MachineInstr &MI);
   };
-  const char PPCCodeEmitter::ID = 0;
+  char PPCCodeEmitter::ID = 0;
 }
 
 /// createPPCCodeEmitterPass - Return a pass that emits the collected PPC code





From dpatel at apple.com  Wed May  2 20:13:55 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 20:13:55 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Instrumentation/BlockProfiling.cpp
	EdgeProfiling.cpp RSProfiling.cpp RSProfiling.h
Message-ID: <200705030113.l431Dt2p029970@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Instrumentation:

BlockProfiling.cpp updated: 1.24 -> 1.25
EdgeProfiling.cpp updated: 1.14 -> 1.15
RSProfiling.cpp updated: 1.26 -> 1.27
RSProfiling.h updated: 1.6 -> 1.7
---
Log message:

Drop 'const'


---
Diffs of the changes:  (+12 -12)

 BlockProfiling.cpp |    8 ++++----
 EdgeProfiling.cpp  |    4 ++--
 RSProfiling.cpp    |   10 +++++-----
 RSProfiling.h      |    2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)


Index: llvm/lib/Transforms/Instrumentation/BlockProfiling.cpp
diff -u llvm/lib/Transforms/Instrumentation/BlockProfiling.cpp:1.24 llvm/lib/Transforms/Instrumentation/BlockProfiling.cpp:1.25
--- llvm/lib/Transforms/Instrumentation/BlockProfiling.cpp:1.24	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Instrumentation/BlockProfiling.cpp	Wed May  2 20:11:54 2007
@@ -33,11 +33,11 @@
 namespace {
   class VISIBILITY_HIDDEN FunctionProfiler : public RSProfilers_std {
   public:
-    static const char ID;
+    static char ID;
     bool runOnModule(Module &M);
   };
 
-  const char FunctionProfiler::ID = 0;
+  char FunctionProfiler::ID = 0;
 
   RegisterPass X("insert-function-profiling",
                                "Insert instrumentation for function profiling");
@@ -84,10 +84,10 @@
   class BlockProfiler : public RSProfilers_std {
     bool runOnModule(Module &M);
   public:
-    static const char ID;
+    static char ID;
   };
 
-  const char BlockProfiler::ID = 0;
+  char BlockProfiler::ID = 0;
   RegisterPass Y("insert-block-profiling",
                                 "Insert instrumentation for block profiling");
   RegisterAnalysisGroup YG(Y);


Index: llvm/lib/Transforms/Instrumentation/EdgeProfiling.cpp
diff -u llvm/lib/Transforms/Instrumentation/EdgeProfiling.cpp:1.14 llvm/lib/Transforms/Instrumentation/EdgeProfiling.cpp:1.15
--- llvm/lib/Transforms/Instrumentation/EdgeProfiling.cpp:1.14	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Instrumentation/EdgeProfiling.cpp	Wed May  2 20:11:54 2007
@@ -33,11 +33,11 @@
   class VISIBILITY_HIDDEN EdgeProfiler : public ModulePass {
     bool runOnModule(Module &M);
   public:
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     EdgeProfiler() : ModulePass((intptr_t)&ID) {}
   };
 
-  const char EdgeProfiler::ID = 0;
+  char EdgeProfiler::ID = 0;
   RegisterPass X("insert-edge-profiling",
                                "Insert instrumentation for edge profiling");
 }


Index: llvm/lib/Transforms/Instrumentation/RSProfiling.cpp
diff -u llvm/lib/Transforms/Instrumentation/RSProfiling.cpp:1.26 llvm/lib/Transforms/Instrumentation/RSProfiling.cpp:1.27
--- llvm/lib/Transforms/Instrumentation/RSProfiling.cpp:1.26	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Instrumentation/RSProfiling.cpp	Wed May  2 20:11:54 2007
@@ -69,7 +69,7 @@
   /// measuring framework overhead
   class VISIBILITY_HIDDEN NullProfilerRS : public RSProfilers {
   public:
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     bool isProfiling(Value* v) {
       return false;
     }
@@ -139,7 +139,7 @@
 
   /// ProfilerRS - Insert the random sampling framework
   struct VISIBILITY_HIDDEN ProfilerRS : public FunctionPass {
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     ProfilerRS() : FunctionPass((intptr_t)&ID) {}
 
     std::map TransCache;
@@ -162,9 +162,9 @@
                              "Insert random sampling instrumentation framework");
 }
 
-const char RSProfilers::ID = 0;
-const char NullProfilerRS::ID = 0;
-const char ProfilerRS::ID = 0;
+char RSProfilers::ID = 0;
+char NullProfilerRS::ID = 0;
+char ProfilerRS::ID = 0;
 
 //Local utilities
 static void ReplacePhiPred(BasicBlock* btarget, 


Index: llvm/lib/Transforms/Instrumentation/RSProfiling.h
diff -u llvm/lib/Transforms/Instrumentation/RSProfiling.h:1.6 llvm/lib/Transforms/Instrumentation/RSProfiling.h:1.7
--- llvm/lib/Transforms/Instrumentation/RSProfiling.h:1.6	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Instrumentation/RSProfiling.h	Wed May  2 20:11:54 2007
@@ -17,7 +17,7 @@
   /// RSProfilers_std - a simple support class for profilers that handles most
   /// of the work of chaining and tracking inserted code.
   struct RSProfilers_std : public RSProfilers {
-    static const char ID;
+    static char ID;
     std::set profcode;
     // Lookup up values in profcode
     virtual bool isProfiling(Value* v);





From dpatel at apple.com  Wed May  2 20:13:56 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 20:13:56 -0500
Subject: [llvm-commits] CVS: llvm/tools/bugpoint/ExtractFunction.cpp
	TestPasses.cpp
Message-ID: <200705030113.l431Du16029980@zion.cs.uiuc.edu>



Changes in directory llvm/tools/bugpoint:

ExtractFunction.cpp updated: 1.60 -> 1.61
TestPasses.cpp updated: 1.12 -> 1.13
---
Log message:

Drop 'const'


---
Diffs of the changes:  (+6 -6)

 ExtractFunction.cpp |    4 ++--
 TestPasses.cpp      |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)


Index: llvm/tools/bugpoint/ExtractFunction.cpp
diff -u llvm/tools/bugpoint/ExtractFunction.cpp:1.60 llvm/tools/bugpoint/ExtractFunction.cpp:1.61
--- llvm/tools/bugpoint/ExtractFunction.cpp:1.60	Wed May  2 16:39:20 2007
+++ llvm/tools/bugpoint/ExtractFunction.cpp	Wed May  2 20:11:54 2007
@@ -306,10 +306,10 @@
   class BlockExtractorPass : public ModulePass {
     bool runOnModule(Module &M);
   public:
-    static const char ID; // Pass ID, replacement for typeid
+    static char ID; // Pass ID, replacement for typeid
     BlockExtractorPass() : ModulePass((intptr_t)&ID) {}
   };
-  const char BlockExtractorPass::ID = 0;
+  char BlockExtractorPass::ID = 0;
   RegisterPass
   XX("extract-bbs", "Extract Basic Blocks From Module (for bugpoint use)");
 }


Index: llvm/tools/bugpoint/TestPasses.cpp
diff -u llvm/tools/bugpoint/TestPasses.cpp:1.12 llvm/tools/bugpoint/TestPasses.cpp:1.13
--- llvm/tools/bugpoint/TestPasses.cpp:1.12	Wed May  2 16:39:20 2007
+++ llvm/tools/bugpoint/TestPasses.cpp	Wed May  2 20:11:54 2007
@@ -26,7 +26,7 @@
   /// crashes on any call instructions.
   class CrashOnCalls : public BasicBlockPass {
   public:
-    static const char ID; // Pass ID, replacement for typeid
+    static char ID; // Pass ID, replacement for typeid
     CrashOnCalls() : BasicBlockPass((intptr_t)&ID) {}
   private:
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
@@ -42,7 +42,7 @@
     }
   };
 
-  const char CrashOnCalls::ID = 0;
+  char CrashOnCalls::ID = 0;
   RegisterPass
   X("bugpoint-crashcalls",
     "BugPoint Test Pass - Intentionally crash on CallInsts");
@@ -53,7 +53,7 @@
   /// deletes some call instructions, "misoptimizing" the program.
   class DeleteCalls : public BasicBlockPass {
   public:
-    static const char ID; // Pass ID, replacement for typeid
+    static char ID; // Pass ID, replacement for typeid
     DeleteCalls() : BasicBlockPass((intptr_t)&ID) {}
   private:
     bool runOnBasicBlock(BasicBlock &BB) {
@@ -68,7 +68,7 @@
     }
   };
  
-  const char DeleteCalls::ID = 0;
+  char DeleteCalls::ID = 0;
   RegisterPass
   Y("bugpoint-deletecalls",
     "BugPoint Test Pass - Intentionally 'misoptimize' CallInsts");





From dpatel at apple.com  Wed May  2 20:13:57 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 20:13:57 -0500
Subject: [llvm-commits] CVS: llvm/tools/opt/AnalysisWrappers.cpp
	GraphPrinters.cpp PrintSCC.cpp opt.cpp
Message-ID: <200705030113.l431Dvsi029991@zion.cs.uiuc.edu>



Changes in directory llvm/tools/opt:

AnalysisWrappers.cpp updated: 1.23 -> 1.24
GraphPrinters.cpp updated: 1.16 -> 1.17
PrintSCC.cpp updated: 1.17 -> 1.18
opt.cpp updated: 1.136 -> 1.137
---
Log message:

Drop 'const'


---
Diffs of the changes:  (+16 -16)

 AnalysisWrappers.cpp |    8 ++++----
 GraphPrinters.cpp    |    4 ++--
 PrintSCC.cpp         |    8 ++++----
 opt.cpp              |   12 ++++++------
 4 files changed, 16 insertions(+), 16 deletions(-)


Index: llvm/tools/opt/AnalysisWrappers.cpp
diff -u llvm/tools/opt/AnalysisWrappers.cpp:1.23 llvm/tools/opt/AnalysisWrappers.cpp:1.24
--- llvm/tools/opt/AnalysisWrappers.cpp:1.23	Wed May  2 16:39:20 2007
+++ llvm/tools/opt/AnalysisWrappers.cpp	Wed May  2 20:11:54 2007
@@ -30,7 +30,7 @@
   /// useful when looking for standard library functions we should constant fold
   /// or handle in alias analyses.
   struct ExternalFunctionsPassedConstants : public ModulePass {
-    static const char ID; // Pass ID, replacement for typeid
+    static char ID; // Pass ID, replacement for typeid
     ExternalFunctionsPassedConstants() : ModulePass((intptr_t)&ID) {}
     virtual bool runOnModule(Module &M) {
       for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I)
@@ -63,12 +63,12 @@
     }
   };
 
-  const char ExternalFunctionsPassedConstants::ID = 0;
+  char ExternalFunctionsPassedConstants::ID = 0;
   RegisterPass
   P1("externalfnconstants", "Print external fn callsites passed constants");
   
   struct CallGraphPrinter : public ModulePass {
-    static const char ID; // Pass ID, replacement for typeid
+    static char ID; // Pass ID, replacement for typeid
     CallGraphPrinter() : ModulePass((intptr_t)&ID) {}
 
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
@@ -82,7 +82,7 @@
     }
   };
   
-  const char CallGraphPrinter::ID = 0;
+  char CallGraphPrinter::ID = 0;
   RegisterPass
     P2("callgraph", "Print a call graph");
 }


Index: llvm/tools/opt/GraphPrinters.cpp
diff -u llvm/tools/opt/GraphPrinters.cpp:1.16 llvm/tools/opt/GraphPrinters.cpp:1.17
--- llvm/tools/opt/GraphPrinters.cpp:1.16	Wed May  2 16:39:20 2007
+++ llvm/tools/opt/GraphPrinters.cpp	Wed May  2 20:11:54 2007
@@ -60,7 +60,7 @@
 
 namespace {
   struct CallGraphPrinter : public ModulePass {
-    static const char ID; // Pass ID, replacement for typeid
+    static char ID; // Pass ID, replacement for typeid
     CallGraphPrinter() : ModulePass((intptr_t)&ID) {}
 
     virtual bool runOnModule(Module &M) {
@@ -77,7 +77,7 @@
     }
   };
 
-  const char CallGraphPrinter::ID = 0;
+  char CallGraphPrinter::ID = 0;
   RegisterPass P2("print-callgraph",
                                     "Print Call Graph to 'dot' file");
 }


Index: llvm/tools/opt/PrintSCC.cpp
diff -u llvm/tools/opt/PrintSCC.cpp:1.17 llvm/tools/opt/PrintSCC.cpp:1.18
--- llvm/tools/opt/PrintSCC.cpp:1.17	Wed May  2 16:39:20 2007
+++ llvm/tools/opt/PrintSCC.cpp	Wed May  2 20:11:54 2007
@@ -35,7 +35,7 @@
 
 namespace {
   struct CFGSCC : public FunctionPass {
-    static const char ID;  // Pass identification, replacement for typeid
+    static char ID;  // Pass identification, replacement for typeid
     CFGSCC() : FunctionPass((intptr_t)&ID) {}
     bool runOnFunction(Function& func);
 
@@ -47,7 +47,7 @@
   };
 
   struct CallGraphSCC : public ModulePass {
-    static const char ID;  // Pass identification, replacement for typeid
+    static char ID;  // Pass identification, replacement for typeid
     CallGraphSCC() : ModulePass((intptr_t)&ID) {}
 
     // run - Print out SCCs in the call graph for the specified module.
@@ -62,11 +62,11 @@
     }
   };
 
-  const char CFGSCC::ID = 0;
+  char CFGSCC::ID = 0;
   RegisterPass
   Y("cfgscc", "Print SCCs of each function CFG");
 
-  const char CallGraphSCC::ID = 0;
+  char CallGraphSCC::ID = 0;
   RegisterPass
   Z("callscc", "Print SCCs of the Call Graph");
 }


Index: llvm/tools/opt/opt.cpp
diff -u llvm/tools/opt/opt.cpp:1.136 llvm/tools/opt/opt.cpp:1.137
--- llvm/tools/opt/opt.cpp:1.136	Wed May  2 16:39:20 2007
+++ llvm/tools/opt/opt.cpp	Wed May  2 20:11:54 2007
@@ -98,7 +98,7 @@
 namespace {
 
 struct ModulePassPrinter : public ModulePass {
-  static const char ID;
+  static char ID;
   const PassInfo *PassToPrint;
   ModulePassPrinter(const PassInfo *PI) : ModulePass((intptr_t)&ID),
                                           PassToPrint(PI) {}
@@ -121,10 +121,10 @@
   }
 };
 
-const char ModulePassPrinter::ID = 0;
+char ModulePassPrinter::ID = 0;
 struct FunctionPassPrinter : public FunctionPass {
   const PassInfo *PassToPrint;
-  static const char ID;
+  static char ID;
   FunctionPassPrinter(const PassInfo *PI) : FunctionPass((intptr_t)&ID),
                                             PassToPrint(PI) {}
 
@@ -146,10 +146,10 @@
   }
 };
 
-const char FunctionPassPrinter::ID = 0;
+char FunctionPassPrinter::ID = 0;
 struct BasicBlockPassPrinter : public BasicBlockPass {
   const PassInfo *PassToPrint;
-  static const char ID;
+  static char ID;
   BasicBlockPassPrinter(const PassInfo *PI) 
     : BasicBlockPass((intptr_t)&ID), PassToPrint(PI) {}
 
@@ -172,7 +172,7 @@
   }
 };
 
-const char BasicBlockPassPrinter::ID = 0;
+char BasicBlockPassPrinter::ID = 0;
 inline void addPass(PassManager &PM, Pass *P) {
   // Add the pass to the pass manager...
   PM.add(P);





From dpatel at apple.com  Wed May  2 20:13:57 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 20:13:57 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Assembly/PrintModulePass.h
Message-ID: <200705030113.l431Dvrq029996@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Assembly:

PrintModulePass.h updated: 1.23 -> 1.24
---
Log message:

Drop 'const'


---
Diffs of the changes:  (+2 -2)

 PrintModulePass.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm/include/llvm/Assembly/PrintModulePass.h
diff -u llvm/include/llvm/Assembly/PrintModulePass.h:1.23 llvm/include/llvm/Assembly/PrintModulePass.h:1.24
--- llvm/include/llvm/Assembly/PrintModulePass.h:1.23	Wed May  2 16:39:18 2007
+++ llvm/include/llvm/Assembly/PrintModulePass.h	Wed May  2 20:11:53 2007
@@ -28,7 +28,7 @@
   OStream *Out;           // ostream to print on
   bool DeleteStream;      // Delete the ostream in our dtor?
 public:
-  static const char ID;
+  static char ID;
   PrintModulePass() : ModulePass((intptr_t)&ID), Out(&cerr), DeleteStream(false) {}
   PrintModulePass(OStream *o, bool DS = false)
     : ModulePass((intptr_t)&ID), Out(o), DeleteStream(DS) {}
@@ -52,7 +52,7 @@
   OStream *Out;           // ostream to print on
   bool DeleteStream;      // Delete the ostream in our dtor?
 public:
-  static const char ID;
+  static char ID;
   PrintFunctionPass() : FunctionPass((intptr_t)&ID), Banner(""), Out(&cerr), 
                         DeleteStream(false) {}
   PrintFunctionPass(const std::string &B, OStream *o = &cout,





From dpatel at apple.com  Wed May  2 20:14:00 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 20:14:00 -0500
Subject: [llvm-commits] CVS: llvm/docs/WritingAnLLVMPass.html
Message-ID: <200705030114.l431E0I0030009@zion.cs.uiuc.edu>



Changes in directory llvm/docs:

WritingAnLLVMPass.html updated: 1.58 -> 1.59
---
Log message:

Drop 'const'


---
Diffs of the changes:  (+4 -4)

 WritingAnLLVMPass.html |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Index: llvm/docs/WritingAnLLVMPass.html
diff -u llvm/docs/WritingAnLLVMPass.html:1.58 llvm/docs/WritingAnLLVMPass.html:1.59
--- llvm/docs/WritingAnLLVMPass.html:1.58	Wed May  2 16:39:18 2007
+++ llvm/docs/WritingAnLLVMPass.html	Wed May  2 20:11:53 2007
@@ -263,7 +263,7 @@
 time.
 
 -     static const char ID;
+     static char ID;
      Hello() : FunctionPass((intptr_t)&ID) {}
 

 
@@ -285,7 +285,7 @@
 function.
 
 -  const char Hello::ID = 0;
+  char Hello::ID = 0;
 
 
  We initialize pass ID here. LLVM uses ID's address to identify pass so 
@@ -311,7 +311,7 @@
 namespace {
   struct Hello : public FunctionPass {
     
-    static const char ID;
+    static char ID;
     Hello() : FunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnFunction(Function &F) {
@@ -1807,7 +1807,7 @@
 
   Chris Lattner

   The LLVM Compiler Infrastructure

-  Last modified: $Date: 2007/05/02 21:39:18 $
+  Last modified: $Date: 2007/05/03 01:11:53 $
 
 
 





From dpatel at apple.com  Wed May  2 20:14:00 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 20:14:00 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/CBackend/CBackend.cpp
Message-ID: <200705030114.l431E0dG030014@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/CBackend:

CBackend.cpp updated: 1.341 -> 1.342
---
Log message:

Drop 'const'


---
Diffs of the changes:  (+4 -4)

 CBackend.cpp |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Index: llvm/lib/Target/CBackend/CBackend.cpp
diff -u llvm/lib/Target/CBackend/CBackend.cpp:1.341 llvm/lib/Target/CBackend/CBackend.cpp:1.342
--- llvm/lib/Target/CBackend/CBackend.cpp:1.341	Wed May  2 16:39:19 2007
+++ llvm/lib/Target/CBackend/CBackend.cpp	Wed May  2 20:11:53 2007
@@ -57,7 +57,7 @@
   ///
   class CBackendNameAllUsedStructsAndMergeFunctions : public ModulePass {
   public:
-    static const char ID;
+    static char ID;
     CBackendNameAllUsedStructsAndMergeFunctions() 
       : ModulePass((intptr_t)&ID) {}
     void getAnalysisUsage(AnalysisUsage &AU) const {
@@ -71,7 +71,7 @@
     virtual bool runOnModule(Module &M);
   };
 
-  const char CBackendNameAllUsedStructsAndMergeFunctions::ID = 0;
+  char CBackendNameAllUsedStructsAndMergeFunctions::ID = 0;
 
   /// CWriter - This class is the main chunk of code that converts an LLVM
   /// module to a C translation unit.
@@ -88,7 +88,7 @@
     std::set intrinsicPrototypesAlreadyGenerated;
 
   public:
-    static const char ID;
+    static char ID;
     CWriter(std::ostream &o) 
       : FunctionPass((intptr_t)&ID), Out(o), IL(0), Mang(0), LI(0), 
         TheModule(0), TAsm(0), TD(0) {}
@@ -264,7 +264,7 @@
   };
 }
 
-const char CWriter::ID = 0;
+char CWriter::ID = 0;
 
 /// This method inserts names for any unnamed structure types that are used by
 /// the program, and removes names from structure types that are not used by the





From dpatel at apple.com  Wed May  2 20:14:01 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 20:14:01 -0500
Subject: [llvm-commits] CVS: llvm/lib/VMCore/AsmWriter.cpp Dominators.cpp
	PassManager.cpp Verifier.cpp
Message-ID: <200705030114.l431E1PP030022@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

AsmWriter.cpp updated: 1.281 -> 1.282
Dominators.cpp updated: 1.99 -> 1.100
PassManager.cpp updated: 1.155 -> 1.156
Verifier.cpp updated: 1.211 -> 1.212
---
Log message:

Drop 'const'


---
Diffs of the changes:  (+16 -16)

 AsmWriter.cpp   |    4 ++--
 Dominators.cpp  |    6 +++---
 PassManager.cpp |   18 +++++++++---------
 Verifier.cpp    |    4 ++--
 4 files changed, 16 insertions(+), 16 deletions(-)


Index: llvm/lib/VMCore/AsmWriter.cpp
diff -u llvm/lib/VMCore/AsmWriter.cpp:1.281 llvm/lib/VMCore/AsmWriter.cpp:1.282
--- llvm/lib/VMCore/AsmWriter.cpp:1.281	Wed May  2 16:39:19 2007
+++ llvm/lib/VMCore/AsmWriter.cpp	Wed May  2 20:11:54 2007
@@ -135,10 +135,10 @@
 
 }  // end namespace llvm
 
-const char PrintModulePass::ID = 0;
+char PrintModulePass::ID = 0;
 static RegisterPass
 X("printm", "Print module to stderr");
-const char PrintFunctionPass::ID = 0;
+char PrintFunctionPass::ID = 0;
 static RegisterPass
 Y("print","Print function to stderr");
 


Index: llvm/lib/VMCore/Dominators.cpp
diff -u llvm/lib/VMCore/Dominators.cpp:1.99 llvm/lib/VMCore/Dominators.cpp:1.100
--- llvm/lib/VMCore/Dominators.cpp:1.99	Wed May  2 16:39:20 2007
+++ llvm/lib/VMCore/Dominators.cpp	Wed May  2 20:11:54 2007
@@ -58,7 +58,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-const char DominatorTree::ID = 0;
+char DominatorTree::ID = 0;
 static RegisterPass
 E("domtree", "Dominator Tree Construction", true);
 
@@ -354,7 +354,7 @@
 //  DominanceFrontier Implementation
 //===----------------------------------------------------------------------===//
 
-const char DominanceFrontier::ID = 0;
+char DominanceFrontier::ID = 0;
 static RegisterPass
 G("domfrontier", "Dominance Frontier Construction", true);
 
@@ -835,7 +835,7 @@
 // ETForest implementation
 //===----------------------------------------------------------------------===//
 
-const char ETForest::ID = 0;
+char ETForest::ID = 0;
 static RegisterPass
 D("etforest", "ET Forest Construction", true);
 


Index: llvm/lib/VMCore/PassManager.cpp
diff -u llvm/lib/VMCore/PassManager.cpp:1.155 llvm/lib/VMCore/PassManager.cpp:1.156
--- llvm/lib/VMCore/PassManager.cpp:1.155	Wed May  2 16:39:20 2007
+++ llvm/lib/VMCore/PassManager.cpp	Wed May  2 20:11:54 2007
@@ -63,7 +63,7 @@
                                         public FunctionPass {
 
 public:
-  static const char ID;
+  static char ID;
   BBPassManager(int Depth) 
     : PMDataManager(Depth), FunctionPass((intptr_t)&ID) {}
 
@@ -106,7 +106,7 @@
   }
 };
 
-const char BBPassManager::ID = 0;
+char BBPassManager::ID = 0;
 }
 
 namespace llvm {
@@ -119,7 +119,7 @@
                                 public PMDataManager,
                                 public PMTopLevelManager {
 public:
-  static const char ID;
+  static char ID;
   FunctionPassManagerImpl(int Depth) : 
     Pass((intptr_t)&ID), PMDataManager(Depth), 
     PMTopLevelManager(TLM_Function) { }
@@ -173,7 +173,7 @@
   }
 };
 
-const char FunctionPassManagerImpl::ID = 0;
+char FunctionPassManagerImpl::ID = 0;
 //===----------------------------------------------------------------------===//
 // MPPassManager
 //
@@ -183,7 +183,7 @@
 class MPPassManager : public Pass, public PMDataManager {
  
 public:
-  static const char ID;
+  static char ID;
   MPPassManager(int Depth) : Pass((intptr_t)&ID), PMDataManager(Depth) { }
 
   // Delete on the fly managers.
@@ -247,7 +247,7 @@
   std::map OnTheFlyManagers;
 };
 
-const char MPPassManager::ID = 0;
+char MPPassManager::ID = 0;
 //===----------------------------------------------------------------------===//
 // PassManagerImpl
 //
@@ -258,7 +258,7 @@
                         public PMTopLevelManager {
 
 public:
-  static const char ID;
+  static char ID;
   PassManagerImpl(int Depth) : Pass((intptr_t)&ID), PMDataManager(Depth),
                                PMTopLevelManager(TLM_Pass) { }
 
@@ -304,7 +304,7 @@
 
 };
 
-const char PassManagerImpl::ID = 0;
+char PassManagerImpl::ID = 0;
 } // End of llvm namespace
 
 namespace {
@@ -1108,7 +1108,7 @@
 //===----------------------------------------------------------------------===//
 // FPPassManager implementation
 
-const char FPPassManager::ID = 0;
+char FPPassManager::ID = 0;
 /// Print passes managed by this manager
 void FPPassManager::dumpPassStructure(unsigned Offset) {
   llvm::cerr << std::string(Offset*2, ' ') << "FunctionPass Manager\n";


Index: llvm/lib/VMCore/Verifier.cpp
diff -u llvm/lib/VMCore/Verifier.cpp:1.211 llvm/lib/VMCore/Verifier.cpp:1.212
--- llvm/lib/VMCore/Verifier.cpp:1.211	Wed May  2 16:39:20 2007
+++ llvm/lib/VMCore/Verifier.cpp	Wed May  2 20:11:54 2007
@@ -69,7 +69,7 @@
 
   struct VISIBILITY_HIDDEN
      Verifier : public FunctionPass, InstVisitor {
-    static const char ID; // Pass ID, replacement for typeid
+    static char ID; // Pass ID, replacement for typeid
     bool Broken;          // Is this module found to be broken?
     bool RealPass;        // Are we not being run by a PassManager?
     VerifierFailureAction action;
@@ -266,7 +266,7 @@
     }
   };
 
-  const char Verifier::ID = 0;
+  char Verifier::ID = 0;
   RegisterPass X("verify", "Module Verifier");
 } // End anonymous namespace
 





From dpatel at apple.com  Wed May  2 20:14:02 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 20:14:02 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/MSIL/MSILWriter.cpp MSILWriter.h
Message-ID: <200705030114.l431E2dE030034@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/MSIL:

MSILWriter.cpp updated: 1.6 -> 1.7
MSILWriter.h updated: 1.4 -> 1.5
---
Log message:

Drop 'const'


---
Diffs of the changes:  (+4 -4)

 MSILWriter.cpp |    4 ++--
 MSILWriter.h   |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


Index: llvm/lib/Target/MSIL/MSILWriter.cpp
diff -u llvm/lib/Target/MSIL/MSILWriter.cpp:1.6 llvm/lib/Target/MSIL/MSILWriter.cpp:1.7
--- llvm/lib/Target/MSIL/MSILWriter.cpp:1.6	Wed May  2 16:39:19 2007
+++ llvm/lib/Target/MSIL/MSILWriter.cpp	Wed May  2 20:11:53 2007
@@ -80,8 +80,8 @@
   return Changed;
 }
 
-const char MSILModule::ID = 0;
-const char MSILWriter::ID = 0;
+char MSILModule::ID = 0;
+char MSILWriter::ID = 0;
 
 bool MSILWriter::runOnFunction(Function &F) {
   if (F.isDeclaration()) return false;


Index: llvm/lib/Target/MSIL/MSILWriter.h
diff -u llvm/lib/Target/MSIL/MSILWriter.h:1.4 llvm/lib/Target/MSIL/MSILWriter.h:1.5
--- llvm/lib/Target/MSIL/MSILWriter.h:1.4	Wed May  2 16:39:19 2007
+++ llvm/lib/Target/MSIL/MSILWriter.h	Wed May  2 20:11:53 2007
@@ -37,7 +37,7 @@
     const TargetData*& TD;
 
   public:
-    static const char ID;
+    static char ID;
     MSILModule(const std::set*& _UsedTypes,
                const TargetData*& _TD)
       : ModulePass((intptr_t)&ID), UsedTypes(_UsedTypes), TD(_TD) {}
@@ -83,7 +83,7 @@
     std::map >
       StaticInitList;
     const std::set* UsedTypes;
-    static const char ID;
+    static char ID;
     MSILWriter(std::ostream &o) : FunctionPass((intptr_t)&ID), Out(o) {
       UniqID = 0;
     }





From dpatel at apple.com  Wed May  2 20:14:02 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 20:14:02 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
Message-ID: <200705030114.l431E2lT030048@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen/SelectionDAG:

SelectionDAGISel.cpp updated: 1.445 -> 1.446
---
Log message:

Drop 'const'


---
Diffs of the changes:  (+1 -1)

 SelectionDAGISel.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.445 llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.446
--- llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.445	Wed May  2 17:15:48 2007
+++ llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp	Wed May  2 20:11:53 2007
@@ -5012,4 +5012,4 @@
     Ops.push_back(InOps.back());
 }
 
-const char SelectionDAGISel::ID = 0;
+char SelectionDAGISel::ID = 0;





From dpatel at apple.com  Wed May  2 20:14:02 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 20:14:02 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Target/TargetData.h
Message-ID: <200705030114.l431E2NL030053@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Target:

TargetData.h updated: 1.62 -> 1.63
---
Log message:

Drop 'const'


---
Diffs of the changes:  (+1 -1)

 TargetData.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/include/llvm/Target/TargetData.h
diff -u llvm/include/llvm/Target/TargetData.h:1.62 llvm/include/llvm/Target/TargetData.h:1.63
--- llvm/include/llvm/Target/TargetData.h:1.62	Wed May  2 16:39:18 2007
+++ llvm/include/llvm/Target/TargetData.h	Wed May  2 20:11:53 2007
@@ -202,7 +202,7 @@
   /// requested alignment (if the global has one).
   unsigned getPreferredAlignmentLog(const GlobalVariable *GV) const;
 
-  static const char ID; // Pass identifcation, replacement for typeid
+  static char ID; // Pass identifcation, replacement for typeid
 };
 
 /// StructLayout - used to lazily calculate structure layout information for a





From dpatel at apple.com  Wed May  2 20:14:02 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 20:14:02 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86CodeEmitter.cpp
	X86FloatingPoint.cpp
Message-ID: <200705030114.l431E2J5030063@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

X86CodeEmitter.cpp updated: 1.135 -> 1.136
X86FloatingPoint.cpp updated: 1.70 -> 1.71
---
Log message:

Drop 'const'


---
Diffs of the changes:  (+4 -4)

 X86CodeEmitter.cpp   |    4 ++--
 X86FloatingPoint.cpp |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


Index: llvm/lib/Target/X86/X86CodeEmitter.cpp
diff -u llvm/lib/Target/X86/X86CodeEmitter.cpp:1.135 llvm/lib/Target/X86/X86CodeEmitter.cpp:1.136
--- llvm/lib/Target/X86/X86CodeEmitter.cpp:1.135	Wed May  2 16:39:19 2007
+++ llvm/lib/Target/X86/X86CodeEmitter.cpp	Wed May  2 20:11:54 2007
@@ -39,7 +39,7 @@
     MachineCodeEmitter  &MCE;
     bool Is64BitMode;
   public:
-    static const char ID;
+    static char ID;
     explicit Emitter(TargetMachine &tm, MachineCodeEmitter &mce)
       : MachineFunctionPass((intptr_t)&ID), II(0), TD(0), TM(tm), 
       MCE(mce), Is64BitMode(false) {}
@@ -82,7 +82,7 @@
     bool isX86_64ExtendedReg(const MachineOperand &MO);
     unsigned determineREX(const MachineInstr &MI);
   };
-  const char Emitter::ID = 0;
+  char Emitter::ID = 0;
 }
 
 /// createX86CodeEmitterPass - Return a pass that emits the collected X86 code


Index: llvm/lib/Target/X86/X86FloatingPoint.cpp
diff -u llvm/lib/Target/X86/X86FloatingPoint.cpp:1.70 llvm/lib/Target/X86/X86FloatingPoint.cpp:1.71
--- llvm/lib/Target/X86/X86FloatingPoint.cpp:1.70	Wed May  2 16:39:19 2007
+++ llvm/lib/Target/X86/X86FloatingPoint.cpp	Wed May  2 20:11:54 2007
@@ -52,7 +52,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN FPS : public MachineFunctionPass {
-    static const char ID;
+    static char ID;
     FPS() : MachineFunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnMachineFunction(MachineFunction &MF);
@@ -154,7 +154,7 @@
     void handleCondMovFP(MachineBasicBlock::iterator &I);
     void handleSpecialFP(MachineBasicBlock::iterator &I);
   };
-  const char FPS::ID = 0;
+  char FPS::ID = 0;
 }
 
 FunctionPass *llvm::createX86FloatingPointStackifierPass() { return new FPS(); }





From dpatel at apple.com  Wed May  2 20:13:59 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 20:13:59 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/Sparc/DelaySlotFiller.cpp
	FPMover.cpp
Message-ID: <200705030113.l431DxSt030003@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/Sparc:

DelaySlotFiller.cpp updated: 1.15 -> 1.16
FPMover.cpp updated: 1.20 -> 1.21
---
Log message:

Drop 'const'


---
Diffs of the changes:  (+4 -4)

 DelaySlotFiller.cpp |    4 ++--
 FPMover.cpp         |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


Index: llvm/lib/Target/Sparc/DelaySlotFiller.cpp
diff -u llvm/lib/Target/Sparc/DelaySlotFiller.cpp:1.15 llvm/lib/Target/Sparc/DelaySlotFiller.cpp:1.16
--- llvm/lib/Target/Sparc/DelaySlotFiller.cpp:1.15	Wed May  2 16:39:19 2007
+++ llvm/lib/Target/Sparc/DelaySlotFiller.cpp	Wed May  2 20:11:54 2007
@@ -30,7 +30,7 @@
     TargetMachine &TM;
     const TargetInstrInfo *TII;
 
-    static const char ID;
+    static char ID;
     Filler(TargetMachine &tm) 
       : MachineFunctionPass((intptr_t)&ID), TM(tm), TII(tm.getInstrInfo()) { }
 
@@ -48,7 +48,7 @@
     }
 
   };
-  const char Filler::ID = 0;
+  char Filler::ID = 0;
 } // end of anonymous namespace
 
 /// createSparcDelaySlotFillerPass - Returns a pass that fills in delay


Index: llvm/lib/Target/Sparc/FPMover.cpp
diff -u llvm/lib/Target/Sparc/FPMover.cpp:1.20 llvm/lib/Target/Sparc/FPMover.cpp:1.21
--- llvm/lib/Target/Sparc/FPMover.cpp:1.20	Wed May  2 16:39:19 2007
+++ llvm/lib/Target/Sparc/FPMover.cpp	Wed May  2 20:11:54 2007
@@ -32,7 +32,7 @@
     ///
     TargetMachine &TM;
     
-    static const char ID;
+    static char ID;
     FPMover(TargetMachine &tm) 
       : MachineFunctionPass((intptr_t)&ID), TM(tm) { }
 
@@ -43,7 +43,7 @@
     bool runOnMachineBasicBlock(MachineBasicBlock &MBB);
     bool runOnMachineFunction(MachineFunction &F);
   };
-  const char FPMover::ID = 0;
+  char FPMover::ID = 0;
 } // end of anonymous namespace
 
 /// createSparcFPMoverPass - Returns a pass that turns FpMOVD





From dpatel at apple.com  Wed May  2 20:14:04 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 20:14:04 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/ADCE.cpp
	BasicBlockPlacement.cpp CodeGenPrepare.cpp CondPropagate.cpp
	ConstantProp.cpp CorrelatedExprs.cpp DCE.cpp
	DeadStoreElimination.cpp GCSE.cpp IndVarSimplify.cpp
	InstructionCombining.cpp LICM.cpp LoopRotation.cpp
	LoopStrengthReduce.cpp LoopUnroll.cpp LoopUnswitch.cpp
	LowerGC.cpp LowerPacked.cpp PredicateSimplifier.cpp
	Reassociate.cpp Reg2Mem.cpp SCCP.cpp ScalarReplAggregates.cpp
	SimplifyCFG.cpp TailDuplication.cpp TailRecursionElimination.cpp
Message-ID: <200705030114.l431E4g2030104@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

ADCE.cpp updated: 1.108 -> 1.109
BasicBlockPlacement.cpp updated: 1.11 -> 1.12
CodeGenPrepare.cpp updated: 1.8 -> 1.9
CondPropagate.cpp updated: 1.20 -> 1.21
ConstantProp.cpp updated: 1.58 -> 1.59
CorrelatedExprs.cpp updated: 1.59 -> 1.60
DCE.cpp updated: 1.65 -> 1.66
DeadStoreElimination.cpp updated: 1.19 -> 1.20
GCSE.cpp updated: 1.55 -> 1.56
IndVarSimplify.cpp updated: 1.117 -> 1.118
InstructionCombining.cpp updated: 1.756 -> 1.757
LICM.cpp updated: 1.98 -> 1.99
LoopRotation.cpp updated: 1.12 -> 1.13
LoopStrengthReduce.cpp updated: 1.133 -> 1.134
LoopUnroll.cpp updated: 1.41 -> 1.42
LoopUnswitch.cpp updated: 1.67 -> 1.68
LowerGC.cpp updated: 1.24 -> 1.25
LowerPacked.cpp updated: 1.23 -> 1.24
PredicateSimplifier.cpp updated: 1.73 -> 1.74
Reassociate.cpp updated: 1.80 -> 1.81
Reg2Mem.cpp updated: 1.14 -> 1.15
SCCP.cpp updated: 1.167 -> 1.168
ScalarReplAggregates.cpp updated: 1.92 -> 1.93
SimplifyCFG.cpp updated: 1.23 -> 1.24
TailDuplication.cpp updated: 1.39 -> 1.40
TailRecursionElimination.cpp updated: 1.32 -> 1.33
---
Log message:

Drop 'const'


---
Diffs of the changes:  (+56 -56)

 ADCE.cpp                     |    4 ++--
 BasicBlockPlacement.cpp      |    4 ++--
 CodeGenPrepare.cpp           |    4 ++--
 CondPropagate.cpp            |    4 ++--
 ConstantProp.cpp             |    4 ++--
 CorrelatedExprs.cpp          |    4 ++--
 DCE.cpp                      |    8 ++++----
 DeadStoreElimination.cpp     |    4 ++--
 GCSE.cpp                     |    4 ++--
 IndVarSimplify.cpp           |    4 ++--
 InstructionCombining.cpp     |    4 ++--
 LICM.cpp                     |    4 ++--
 LoopRotation.cpp             |    4 ++--
 LoopStrengthReduce.cpp       |    4 ++--
 LoopUnroll.cpp               |    4 ++--
 LoopUnswitch.cpp             |    4 ++--
 LowerGC.cpp                  |    4 ++--
 LowerPacked.cpp              |    4 ++--
 PredicateSimplifier.cpp      |    4 ++--
 Reassociate.cpp              |    4 ++--
 Reg2Mem.cpp                  |    4 ++--
 SCCP.cpp                     |    8 ++++----
 ScalarReplAggregates.cpp     |    4 ++--
 SimplifyCFG.cpp              |    4 ++--
 TailDuplication.cpp          |    4 ++--
 TailRecursionElimination.cpp |    4 ++--
 26 files changed, 56 insertions(+), 56 deletions(-)


Index: llvm/lib/Transforms/Scalar/ADCE.cpp
diff -u llvm/lib/Transforms/Scalar/ADCE.cpp:1.108 llvm/lib/Transforms/Scalar/ADCE.cpp:1.109
--- llvm/lib/Transforms/Scalar/ADCE.cpp:1.108	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Scalar/ADCE.cpp	Wed May  2 20:11:54 2007
@@ -52,7 +52,7 @@
   // The public interface for this class
   //
 public:
-  static const char ID; // Pass identifcation, replacement for typeid
+  static char ID; // Pass identifcation, replacement for typeid
   ADCE() : FunctionPass((intptr_t)&ID) {}
 
   // Execute the Aggressive Dead Code Elimination Algorithm
@@ -107,7 +107,7 @@
   }
 };
 
-  const char ADCE::ID = 0;
+  char ADCE::ID = 0;
   RegisterPass X("adce", "Aggressive Dead Code Elimination");
 } // End of anonymous namespace
 


Index: llvm/lib/Transforms/Scalar/BasicBlockPlacement.cpp
diff -u llvm/lib/Transforms/Scalar/BasicBlockPlacement.cpp:1.11 llvm/lib/Transforms/Scalar/BasicBlockPlacement.cpp:1.12
--- llvm/lib/Transforms/Scalar/BasicBlockPlacement.cpp:1.11	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Scalar/BasicBlockPlacement.cpp	Wed May  2 20:11:54 2007
@@ -41,7 +41,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN BlockPlacement : public FunctionPass {
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     BlockPlacement() : FunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnFunction(Function &F);
@@ -73,7 +73,7 @@
     void PlaceBlocks(BasicBlock *BB);
   };
 
-  const char BlockPlacement::ID = 0;
+  char BlockPlacement::ID = 0;
   RegisterPass X("block-placement",
                                  "Profile Guided Basic Block Placement");
 }


Index: llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp
diff -u llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp:1.8 llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp:1.9
--- llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp:1.8	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp	Wed May  2 20:11:54 2007
@@ -39,7 +39,7 @@
     /// transformation profitability.
     const TargetLowering *TLI;
   public:
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     CodeGenPrepare(const TargetLowering *tli = 0) : FunctionPass((intptr_t)&ID),
       TLI(tli) {}
     bool runOnFunction(Function &F);
@@ -55,7 +55,7 @@
   };
 }
 
-const char CodeGenPrepare::ID = 0;
+char CodeGenPrepare::ID = 0;
 static RegisterPass X("codegenprepare",
                                       "Optimize for code generation");
 


Index: llvm/lib/Transforms/Scalar/CondPropagate.cpp
diff -u llvm/lib/Transforms/Scalar/CondPropagate.cpp:1.20 llvm/lib/Transforms/Scalar/CondPropagate.cpp:1.21
--- llvm/lib/Transforms/Scalar/CondPropagate.cpp:1.20	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Scalar/CondPropagate.cpp	Wed May  2 20:11:54 2007
@@ -31,7 +31,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN CondProp : public FunctionPass {
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     CondProp() : FunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnFunction(Function &F);
@@ -49,7 +49,7 @@
     void RevectorBlockTo(BasicBlock *FromBB, BasicBlock *ToBB);
   };
   
-  const char CondProp::ID = 0;
+  char CondProp::ID = 0;
   RegisterPass X("condprop", "Conditional Propagation");
 }
 


Index: llvm/lib/Transforms/Scalar/ConstantProp.cpp
diff -u llvm/lib/Transforms/Scalar/ConstantProp.cpp:1.58 llvm/lib/Transforms/Scalar/ConstantProp.cpp:1.59
--- llvm/lib/Transforms/Scalar/ConstantProp.cpp:1.58	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Scalar/ConstantProp.cpp	Wed May  2 20:11:54 2007
@@ -34,7 +34,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN ConstantPropagation : public FunctionPass {
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     ConstantPropagation() : FunctionPass((intptr_t)&ID) {}
 
     bool runOnFunction(Function &F);
@@ -44,7 +44,7 @@
     }
   };
 
-  const char ConstantPropagation::ID = 0;
+  char ConstantPropagation::ID = 0;
   RegisterPass X("constprop",
                                       "Simple constant propagation");
 }


Index: llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp
diff -u llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp:1.59 llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp:1.60
--- llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp:1.59	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp	Wed May  2 20:11:54 2007
@@ -225,7 +225,7 @@
     std::map RegionInfoMap;
     ETForest *EF;
   public:
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     CEE() : FunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnFunction(Function &F);
@@ -288,7 +288,7 @@
     bool SimplifyInstruction(Instruction *Inst, const RegionInfo &RI);
   };
   
-  const char CEE::ID = 0;
+  char CEE::ID = 0;
   RegisterPass X("cee", "Correlated Expression Elimination");
 }
 


Index: llvm/lib/Transforms/Scalar/DCE.cpp
diff -u llvm/lib/Transforms/Scalar/DCE.cpp:1.65 llvm/lib/Transforms/Scalar/DCE.cpp:1.66
--- llvm/lib/Transforms/Scalar/DCE.cpp:1.65	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Scalar/DCE.cpp	Wed May  2 20:11:54 2007
@@ -35,7 +35,7 @@
   // DeadInstElimination pass implementation
   //
   struct VISIBILITY_HIDDEN DeadInstElimination : public BasicBlockPass {
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     DeadInstElimination() : BasicBlockPass(intptr_t(&ID)) {}
     virtual bool runOnBasicBlock(BasicBlock &BB) {
       bool Changed = false;
@@ -53,7 +53,7 @@
     }
   };
 
-  const char DeadInstElimination::ID = 0;
+  char DeadInstElimination::ID = 0;
   RegisterPass X("die", "Dead Instruction Elimination");
 }
 
@@ -67,7 +67,7 @@
   // DeadCodeElimination pass implementation
   //
   struct DCE : public FunctionPass {
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     DCE() : FunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnFunction(Function &F);
@@ -77,7 +77,7 @@
     }
  };
 
-  const char DCE::ID = 0;
+  char DCE::ID = 0;
   RegisterPass Y("dce", "Dead Code Elimination");
 }
 


Index: llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp
diff -u llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp:1.19 llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp:1.20
--- llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp:1.19	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp	Wed May  2 20:11:54 2007
@@ -34,7 +34,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN DSE : public FunctionPass {
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     DSE() : FunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnFunction(Function &F) {
@@ -58,7 +58,7 @@
       AU.addPreserved();
     }
   };
-  const char DSE::ID = 0;
+  char DSE::ID = 0;
   RegisterPass X("dse", "Dead Store Elimination");
 }
 


Index: llvm/lib/Transforms/Scalar/GCSE.cpp
diff -u llvm/lib/Transforms/Scalar/GCSE.cpp:1.55 llvm/lib/Transforms/Scalar/GCSE.cpp:1.56
--- llvm/lib/Transforms/Scalar/GCSE.cpp:1.55	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Scalar/GCSE.cpp	Wed May  2 20:11:54 2007
@@ -37,7 +37,7 @@
                           "with constant values");
 namespace {
   struct VISIBILITY_HIDDEN GCSE : public FunctionPass {
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     GCSE() : FunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnFunction(Function &F);
@@ -54,7 +54,7 @@
     }
   };
 
-  const char GCSE::ID = 0;
+  char GCSE::ID = 0;
   RegisterPass X("gcse", "Global Common Subexpression Elimination");
 }
 


Index: llvm/lib/Transforms/Scalar/IndVarSimplify.cpp
diff -u llvm/lib/Transforms/Scalar/IndVarSimplify.cpp:1.117 llvm/lib/Transforms/Scalar/IndVarSimplify.cpp:1.118
--- llvm/lib/Transforms/Scalar/IndVarSimplify.cpp:1.117	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Scalar/IndVarSimplify.cpp	Wed May  2 20:11:54 2007
@@ -69,7 +69,7 @@
     bool Changed;
   public:
 
-   static const char ID; // Pass identifcation, replacement for typeid
+   static char ID; // Pass identifcation, replacement for typeid
    IndVarSimplify() : LoopPass((intptr_t)&ID) {}
 
    bool runOnLoop(Loop *L, LPPassManager &LPM);
@@ -95,7 +95,7 @@
     void DeleteTriviallyDeadInstructions(std::set &Insts);
   };
 
-  const char IndVarSimplify::ID = 0;
+  char IndVarSimplify::ID = 0;
   RegisterPass X("indvars", "Canonicalize Induction Variables");
 }
 


Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.756 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.757
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.756	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Wed May  2 20:11:54 2007
@@ -76,7 +76,7 @@
     TargetData *TD;
     bool MustPreserveLCSSA;
   public:
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     InstCombiner() : FunctionPass((intptr_t)&ID) {}
 
     /// AddToWorkList - Add the specified instruction to the worklist if it
@@ -361,7 +361,7 @@
     Value *EvaluateInDifferentType(Value *V, const Type *Ty, bool isSigned);
   };
 
-  const char InstCombiner::ID = 0;
+  char InstCombiner::ID = 0;
   RegisterPass X("instcombine", "Combine redundant instructions");
 }
 


Index: llvm/lib/Transforms/Scalar/LICM.cpp
diff -u llvm/lib/Transforms/Scalar/LICM.cpp:1.98 llvm/lib/Transforms/Scalar/LICM.cpp:1.99
--- llvm/lib/Transforms/Scalar/LICM.cpp:1.98	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Scalar/LICM.cpp	Wed May  2 20:11:54 2007
@@ -63,7 +63,7 @@
                    cl::desc("Disable memory promotion in LICM pass"));
 
   struct VISIBILITY_HIDDEN LICM : public LoopPass {
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     LICM() : LoopPass((intptr_t)&ID) {}
 
     virtual bool runOnLoop(Loop *L, LPPassManager &LPM);
@@ -204,7 +204,7 @@
                                     std::map &Val2AlMap);
   };
 
-  const char LICM::ID = 0;
+  char LICM::ID = 0;
   RegisterPass X("licm", "Loop Invariant Code Motion");
 }
 


Index: llvm/lib/Transforms/Scalar/LoopRotation.cpp
diff -u llvm/lib/Transforms/Scalar/LoopRotation.cpp:1.12 llvm/lib/Transforms/Scalar/LoopRotation.cpp:1.13
--- llvm/lib/Transforms/Scalar/LoopRotation.cpp:1.12	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Scalar/LoopRotation.cpp	Wed May  2 20:11:54 2007
@@ -44,7 +44,7 @@
   class VISIBILITY_HIDDEN LoopRotate : public LoopPass {
 
   public:
-    static const char ID; // Pass ID, replacement for typeid
+    static char ID; // Pass ID, replacement for typeid
     LoopRotate() : LoopPass((intptr_t)&ID) {}
 
     // Rotate Loop L as many times as possible. Return true if
@@ -94,7 +94,7 @@
     SmallVector LoopHeaderInfo;
   };
   
-  const char LoopRotate::ID = 0;
+  char LoopRotate::ID = 0;
   RegisterPass X ("loop-rotate", "Rotate Loops");
 }
 


Index: llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp
diff -u llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp:1.133 llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp:1.134
--- llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp:1.133	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp	Wed May  2 20:11:54 2007
@@ -143,7 +143,7 @@
     const TargetLowering *TLI;
 
   public:
-    static const char ID; // Pass ID, replacement for typeid
+    static char ID; // Pass ID, replacement for typeid
     LoopStrengthReduce(const TargetLowering *tli = NULL) : 
       LoopPass((intptr_t)&ID), TLI(tli) {
     }
@@ -188,7 +188,7 @@
                                       Loop *L, bool isOnlyStride);
     void DeleteTriviallyDeadInstructions(std::set &Insts);
   };
-  const char LoopStrengthReduce::ID = 0;
+  char LoopStrengthReduce::ID = 0;
   RegisterPass X("loop-reduce", "Loop Strength Reduction");
 }
 


Index: llvm/lib/Transforms/Scalar/LoopUnroll.cpp
diff -u llvm/lib/Transforms/Scalar/LoopUnroll.cpp:1.41 llvm/lib/Transforms/Scalar/LoopUnroll.cpp:1.42
--- llvm/lib/Transforms/Scalar/LoopUnroll.cpp:1.41	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Scalar/LoopUnroll.cpp	Wed May  2 20:11:54 2007
@@ -49,7 +49,7 @@
   class VISIBILITY_HIDDEN LoopUnroll : public LoopPass {
     LoopInfo *LI;  // The current loop information
   public:
-    static const char ID; // Pass ID, replacement for typeid
+    static char ID; // Pass ID, replacement for typeid
     LoopUnroll()  : LoopPass((intptr_t)&ID) {}
 
     bool runOnLoop(Loop *L, LPPassManager &LPM);
@@ -66,7 +66,7 @@
       AU.addPreserved();
     }
   };
-  const char LoopUnroll::ID = 0;
+  char LoopUnroll::ID = 0;
   RegisterPass X("loop-unroll", "Unroll loops");
 }
 


Index: llvm/lib/Transforms/Scalar/LoopUnswitch.cpp
diff -u llvm/lib/Transforms/Scalar/LoopUnswitch.cpp:1.67 llvm/lib/Transforms/Scalar/LoopUnswitch.cpp:1.68
--- llvm/lib/Transforms/Scalar/LoopUnswitch.cpp:1.67	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Scalar/LoopUnswitch.cpp	Wed May  2 20:11:54 2007
@@ -69,7 +69,7 @@
     SmallPtrSet UnswitchedVals;
 
   public:
-    static const char ID; // Pass ID, replacement for typeid
+    static char ID; // Pass ID, replacement for typeid
     LoopUnswitch() : LoopPass((intptr_t)&ID) {}
 
     bool runOnLoop(Loop *L, LPPassManager &LPM);
@@ -112,7 +112,7 @@
                            std::vector &Worklist);
     void RemoveLoopFromHierarchy(Loop *L);
   };
-  const char LoopUnswitch::ID = 0;
+  char LoopUnswitch::ID = 0;
   RegisterPass X("loop-unswitch", "Unswitch loops");
 }
 


Index: llvm/lib/Transforms/Scalar/LowerGC.cpp
diff -u llvm/lib/Transforms/Scalar/LowerGC.cpp:1.24 llvm/lib/Transforms/Scalar/LowerGC.cpp:1.25
--- llvm/lib/Transforms/Scalar/LowerGC.cpp:1.24	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Scalar/LowerGC.cpp	Wed May  2 20:11:54 2007
@@ -47,7 +47,7 @@
     /// had zero roots.
     const Type *MainRootRecordType;
   public:
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     LowerGC() : FunctionPass((intptr_t)&ID), 
                 GCRootInt(0), GCReadInt(0), GCWriteInt(0),
                 GCRead(0), GCWrite(0), RootChain(0), MainRootRecordType(0) {}
@@ -58,7 +58,7 @@
     const StructType *getRootRecordType(unsigned NumRoots);
   };
 
-  const char LowerGC::ID = 0;
+  char LowerGC::ID = 0;
   RegisterPass
   X("lowergc", "Lower GC intrinsics, for GCless code generators");
 }


Index: llvm/lib/Transforms/Scalar/LowerPacked.cpp
diff -u llvm/lib/Transforms/Scalar/LowerPacked.cpp:1.23 llvm/lib/Transforms/Scalar/LowerPacked.cpp:1.24
--- llvm/lib/Transforms/Scalar/LowerPacked.cpp:1.23	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Scalar/LowerPacked.cpp	Wed May  2 20:11:54 2007
@@ -40,7 +40,7 @@
 class VISIBILITY_HIDDEN LowerPacked 
   : public FunctionPass, public InstVisitor {
 public:
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     LowerPacked() : FunctionPass((intptr_t)&ID) {}
 
    /// @brief Lowers packed operations to scalar operations.
@@ -107,7 +107,7 @@
    std::vector instrsToRemove;
 };
 
-const char LowerPacked::ID = 0;
+char LowerPacked::ID = 0;
 RegisterPass
 X("lower-packed",
   "lowers packed operations to operations on smaller packed datatypes");


Index: llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp
diff -u llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp:1.73 llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp:1.74
--- llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp:1.73	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp	Wed May  2 20:11:54 2007
@@ -1989,7 +1989,7 @@
     std::vector WorkList;
 
   public:
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     PredicateSimplifier() : FunctionPass((intptr_t)&ID) {}
 
     bool runOnFunction(Function &F);
@@ -2377,7 +2377,7 @@
     }
   }
 
-  const char PredicateSimplifier::ID = 0;
+  char PredicateSimplifier::ID = 0;
   RegisterPass X("predsimplify",
                                       "Predicate Simplifier");
 }


Index: llvm/lib/Transforms/Scalar/Reassociate.cpp
diff -u llvm/lib/Transforms/Scalar/Reassociate.cpp:1.80 llvm/lib/Transforms/Scalar/Reassociate.cpp:1.81
--- llvm/lib/Transforms/Scalar/Reassociate.cpp:1.80	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Scalar/Reassociate.cpp	Wed May  2 20:11:54 2007
@@ -69,7 +69,7 @@
     std::map ValueRankMap;
     bool MadeChange;
   public:
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     Reassociate() : FunctionPass((intptr_t)&ID) {}
 
     bool runOnFunction(Function &F);
@@ -92,7 +92,7 @@
     void RemoveDeadBinaryOp(Value *V);
   };
 
-  const char Reassociate::ID = 0;
+  char Reassociate::ID = 0;
   RegisterPass X("reassociate", "Reassociate expressions");
 }
 


Index: llvm/lib/Transforms/Scalar/Reg2Mem.cpp
diff -u llvm/lib/Transforms/Scalar/Reg2Mem.cpp:1.14 llvm/lib/Transforms/Scalar/Reg2Mem.cpp:1.15
--- llvm/lib/Transforms/Scalar/Reg2Mem.cpp:1.14	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Scalar/Reg2Mem.cpp	Wed May  2 20:11:54 2007
@@ -33,7 +33,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN RegToMem : public FunctionPass {
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     RegToMem() : FunctionPass((intptr_t)&ID) {}
 
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
@@ -78,7 +78,7 @@
     }
   };
   
-  const char RegToMem::ID = 0;
+  char RegToMem::ID = 0;
   RegisterPass X("reg2mem", "Demote all values to stack slots");
 }
 


Index: llvm/lib/Transforms/Scalar/SCCP.cpp
diff -u llvm/lib/Transforms/Scalar/SCCP.cpp:1.167 llvm/lib/Transforms/Scalar/SCCP.cpp:1.168
--- llvm/lib/Transforms/Scalar/SCCP.cpp:1.167	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Scalar/SCCP.cpp	Wed May  2 20:11:54 2007
@@ -1334,7 +1334,7 @@
   /// Sparse Conditional Constant Propagator.
   ///
   struct VISIBILITY_HIDDEN SCCP : public FunctionPass {
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     SCCP() : FunctionPass((intptr_t)&ID) {}
 
     // runOnFunction - Run the Sparse Conditional Constant Propagation
@@ -1347,7 +1347,7 @@
     }
   };
 
-  const char SCCP::ID = 0;
+  char SCCP::ID = 0;
   RegisterPass X("sccp", "Sparse Conditional Constant Propagation");
 } // end anonymous namespace
 
@@ -1447,12 +1447,12 @@
   /// Constant Propagation.
   ///
   struct VISIBILITY_HIDDEN IPSCCP : public ModulePass {
-    static const char ID;
+    static char ID;
     IPSCCP() : ModulePass((intptr_t)&ID) {}
     bool runOnModule(Module &M);
   };
 
-  const char IPSCCP::ID = 0;
+  char IPSCCP::ID = 0;
   RegisterPass
   Y("ipsccp", "Interprocedural Sparse Conditional Constant Propagation");
 } // end anonymous namespace


Index: llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp
diff -u llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp:1.92 llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp:1.93
--- llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp:1.92	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp	Wed May  2 20:11:54 2007
@@ -47,7 +47,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN SROA : public FunctionPass {
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     SROA() : FunctionPass((intptr_t)&ID) {}
 
     bool runOnFunction(Function &F);
@@ -84,7 +84,7 @@
     static Instruction *isOnlyCopiedFromConstantGlobal(AllocationInst *AI);
   };
 
-  const char SROA::ID = 0;
+  char SROA::ID = 0;
   RegisterPass X("scalarrepl", "Scalar Replacement of Aggregates");
 }
 


Index: llvm/lib/Transforms/Scalar/SimplifyCFG.cpp
diff -u llvm/lib/Transforms/Scalar/SimplifyCFG.cpp:1.23 llvm/lib/Transforms/Scalar/SimplifyCFG.cpp:1.24
--- llvm/lib/Transforms/Scalar/SimplifyCFG.cpp:1.23	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Scalar/SimplifyCFG.cpp	Wed May  2 20:11:54 2007
@@ -35,12 +35,12 @@
 
 namespace {
   struct VISIBILITY_HIDDEN CFGSimplifyPass : public FunctionPass {
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     CFGSimplifyPass() : FunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnFunction(Function &F);
   };
-  const char CFGSimplifyPass::ID = 0;
+  char CFGSimplifyPass::ID = 0;
   RegisterPass X("simplifycfg", "Simplify the CFG");
 }
 


Index: llvm/lib/Transforms/Scalar/TailDuplication.cpp
diff -u llvm/lib/Transforms/Scalar/TailDuplication.cpp:1.39 llvm/lib/Transforms/Scalar/TailDuplication.cpp:1.40
--- llvm/lib/Transforms/Scalar/TailDuplication.cpp:1.39	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Scalar/TailDuplication.cpp	Wed May  2 20:11:54 2007
@@ -43,14 +43,14 @@
   class VISIBILITY_HIDDEN TailDup : public FunctionPass {
     bool runOnFunction(Function &F);
   public:
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     TailDup() : FunctionPass((intptr_t)&ID) {}
 
   private:
     inline bool shouldEliminateUnconditionalBranch(TerminatorInst *TI);
     inline void eliminateUnconditionalBranch(BranchInst *BI);
   };
-  const char TailDup::ID = 0;
+  char TailDup::ID = 0;
   RegisterPass X("tailduplicate", "Tail Duplication");
 }
 


Index: llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp
diff -u llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp:1.32 llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp:1.33
--- llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp:1.32	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp	Wed May  2 20:11:54 2007
@@ -67,7 +67,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN TailCallElim : public FunctionPass {
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     TailCallElim() : FunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnFunction(Function &F);
@@ -80,7 +80,7 @@
     bool CanMoveAboveCall(Instruction *I, CallInst *CI);
     Value *CanTransformAccumulatorRecursion(Instruction *I, CallInst *CI);
   };
-  const char TailCallElim::ID = 0;
+  char TailCallElim::ID = 0;
   RegisterPass X("tailcallelim", "Tail Call Elimination");
 }
 





From dpatel at apple.com  Wed May  2 20:14:05 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 20:14:05 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/TargetData.cpp
Message-ID: <200705030114.l431E5uC030110@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target:

TargetData.cpp updated: 1.110 -> 1.111
---
Log message:

Drop 'const'


---
Diffs of the changes:  (+1 -1)

 TargetData.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/lib/Target/TargetData.cpp
diff -u llvm/lib/Target/TargetData.cpp:1.110 llvm/lib/Target/TargetData.cpp:1.111
--- llvm/lib/Target/TargetData.cpp:1.110	Wed May  2 16:39:19 2007
+++ llvm/lib/Target/TargetData.cpp	Wed May  2 20:11:53 2007
@@ -35,7 +35,7 @@
   // Register the default SparcV9 implementation...
   RegisterPass X("targetdata", "Target Data Layout");
 }
-const char TargetData::ID = 0;
+char TargetData::ID = 0;
 
 //===----------------------------------------------------------------------===//
 // Support for StructLayout





From dpatel at apple.com  Wed May  2 20:14:08 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 20:14:08 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/IPO/ArgumentPromotion.cpp
	ConstantMerge.cpp DeadArgumentElimination.cpp
	DeadTypeElimination.cpp ExtractFunction.cpp GlobalDCE.cpp
	GlobalOpt.cpp IPConstantPropagation.cpp IndMemRemoval.cpp
	InlineSimple.cpp Inliner.cpp Inliner.h Internalize.cpp
	LoopExtractor.cpp LowerSetJmp.cpp PruneEH.cpp
	RaiseAllocations.cpp SimplifyLibCalls.cpp
	StripDeadPrototypes.cpp StripSymbols.cpp
Message-ID: <200705030114.l431E8Ln030157@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/IPO:

ArgumentPromotion.cpp updated: 1.41 -> 1.42
ConstantMerge.cpp updated: 1.41 -> 1.42
DeadArgumentElimination.cpp updated: 1.42 -> 1.43
DeadTypeElimination.cpp updated: 1.64 -> 1.65
ExtractFunction.cpp updated: 1.22 -> 1.23
GlobalDCE.cpp updated: 1.47 -> 1.48
GlobalOpt.cpp updated: 1.103 -> 1.104
IPConstantPropagation.cpp updated: 1.25 -> 1.26
IndMemRemoval.cpp updated: 1.17 -> 1.18
InlineSimple.cpp updated: 1.80 -> 1.81
Inliner.cpp updated: 1.39 -> 1.40
Inliner.h updated: 1.11 -> 1.12
Internalize.cpp updated: 1.47 -> 1.48
LoopExtractor.cpp updated: 1.26 -> 1.27
LowerSetJmp.cpp updated: 1.42 -> 1.43
PruneEH.cpp updated: 1.33 -> 1.34
RaiseAllocations.cpp updated: 1.42 -> 1.43
SimplifyLibCalls.cpp updated: 1.114 -> 1.115
StripDeadPrototypes.cpp updated: 1.7 -> 1.8
StripSymbols.cpp updated: 1.17 -> 1.18
---
Log message:

Drop 'const'


---
Diffs of the changes:  (+44 -44)

 ArgumentPromotion.cpp       |    4 ++--
 ConstantMerge.cpp           |    4 ++--
 DeadArgumentElimination.cpp |    8 ++++----
 DeadTypeElimination.cpp     |    4 ++--
 ExtractFunction.cpp         |    4 ++--
 GlobalDCE.cpp               |    4 ++--
 GlobalOpt.cpp               |    4 ++--
 IPConstantPropagation.cpp   |    4 ++--
 IndMemRemoval.cpp           |    4 ++--
 InlineSimple.cpp            |    4 ++--
 Inliner.cpp                 |    2 +-
 Inliner.h                   |    2 +-
 Internalize.cpp             |    4 ++--
 LoopExtractor.cpp           |   12 ++++++------
 LowerSetJmp.cpp             |    4 ++--
 PruneEH.cpp                 |    4 ++--
 RaiseAllocations.cpp        |    4 ++--
 SimplifyLibCalls.cpp        |    4 ++--
 StripDeadPrototypes.cpp     |    4 ++--
 StripSymbols.cpp            |    4 ++--
 20 files changed, 44 insertions(+), 44 deletions(-)


Index: llvm/lib/Transforms/IPO/ArgumentPromotion.cpp
diff -u llvm/lib/Transforms/IPO/ArgumentPromotion.cpp:1.41 llvm/lib/Transforms/IPO/ArgumentPromotion.cpp:1.42
--- llvm/lib/Transforms/IPO/ArgumentPromotion.cpp:1.41	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/IPO/ArgumentPromotion.cpp	Wed May  2 20:11:54 2007
@@ -63,7 +63,7 @@
     }
 
     virtual bool runOnSCC(const std::vector &SCC);
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     ArgPromotion() : CallGraphSCCPass((intptr_t)&ID) {}
 
   private:
@@ -72,7 +72,7 @@
     Function *DoPromotion(Function *F, std::vector &ArgsToPromote);
   };
 
-  const char ArgPromotion::ID = 0;
+  char ArgPromotion::ID = 0;
   RegisterPass X("argpromotion",
                                "Promote 'by reference' arguments to scalars");
 }


Index: llvm/lib/Transforms/IPO/ConstantMerge.cpp
diff -u llvm/lib/Transforms/IPO/ConstantMerge.cpp:1.41 llvm/lib/Transforms/IPO/ConstantMerge.cpp:1.42
--- llvm/lib/Transforms/IPO/ConstantMerge.cpp:1.41	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/IPO/ConstantMerge.cpp	Wed May  2 20:11:54 2007
@@ -29,7 +29,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN ConstantMerge : public ModulePass {
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     ConstantMerge() : ModulePass((intptr_t)&ID) {}
 
     // run - For this pass, process all of the globals in the module,
@@ -38,7 +38,7 @@
     bool runOnModule(Module &M);
   };
 
-  const char ConstantMerge::ID = 0;
+  char ConstantMerge::ID = 0;
   RegisterPassX("constmerge","Merge Duplicate Global Constants");
 }
 


Index: llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp
diff -u llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp:1.42 llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp:1.43
--- llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp:1.42	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp	Wed May  2 20:11:54 2007
@@ -76,7 +76,7 @@
     std::multimap CallSites;
 
   public:
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     DAE() : ModulePass((intptr_t)&ID) {}
     bool runOnModule(Module &M);
 
@@ -95,17 +95,17 @@
 
     void RemoveDeadArgumentsFromFunction(Function *F);
   };
-  const char DAE::ID = 0;
+  char DAE::ID = 0;
   RegisterPass X("deadargelim", "Dead Argument Elimination");
 
   /// DAH - DeadArgumentHacking pass - Same as dead argument elimination, but
   /// deletes arguments to functions which are external.  This is only for use
   /// by bugpoint.
   struct DAH : public DAE {
-    static const char ID;
+    static char ID;
     virtual bool ShouldHackArguments() const { return true; }
   };
-  const char DAH::ID = 0;
+  char DAH::ID = 0;
   RegisterPass Y("deadarghaX0r",
                       "Dead Argument Hacking (BUGPOINT USE ONLY; DO NOT USE)");
 }


Index: llvm/lib/Transforms/IPO/DeadTypeElimination.cpp
diff -u llvm/lib/Transforms/IPO/DeadTypeElimination.cpp:1.64 llvm/lib/Transforms/IPO/DeadTypeElimination.cpp:1.65
--- llvm/lib/Transforms/IPO/DeadTypeElimination.cpp:1.64	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/IPO/DeadTypeElimination.cpp	Wed May  2 20:11:54 2007
@@ -26,7 +26,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN DTE : public ModulePass {
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     DTE() : ModulePass((intptr_t)&ID) {}
 
     // doPassInitialization - For this pass, it removes global symbol table
@@ -43,7 +43,7 @@
       AU.addRequired();
     }
   };
-  const char DTE::ID = 0;
+  char DTE::ID = 0;
   RegisterPass X("deadtypeelim", "Dead Type Elimination");
 }
 


Index: llvm/lib/Transforms/IPO/ExtractFunction.cpp
diff -u llvm/lib/Transforms/IPO/ExtractFunction.cpp:1.22 llvm/lib/Transforms/IPO/ExtractFunction.cpp:1.23
--- llvm/lib/Transforms/IPO/ExtractFunction.cpp:1.22	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/IPO/ExtractFunction.cpp	Wed May  2 20:11:54 2007
@@ -25,7 +25,7 @@
     bool deleteFunc;
     bool reLink;
   public:
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
 
     /// FunctionExtractorPass - If deleteFn is true, this pass deletes as the
     /// specified function. Otherwise, it deletes as much of the module as
@@ -134,7 +134,7 @@
     }
   };
 
-  const char FunctionExtractorPass::ID = 0;
+  char FunctionExtractorPass::ID = 0;
   RegisterPass X("extract", "Function Extractor");
 }
 


Index: llvm/lib/Transforms/IPO/GlobalDCE.cpp
diff -u llvm/lib/Transforms/IPO/GlobalDCE.cpp:1.47 llvm/lib/Transforms/IPO/GlobalDCE.cpp:1.48
--- llvm/lib/Transforms/IPO/GlobalDCE.cpp:1.47	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/IPO/GlobalDCE.cpp	Wed May  2 20:11:54 2007
@@ -30,7 +30,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN GlobalDCE : public ModulePass {
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     GlobalDCE() : ModulePass((intptr_t)&ID) {}
  
     // run - Do the GlobalDCE pass on the specified module, optionally updating
@@ -49,7 +49,7 @@
     bool SafeToDestroyConstant(Constant* C);
     bool RemoveUnusedGlobalValue(GlobalValue &GV);
   };
-  const char GlobalDCE::ID = 0;
+  char GlobalDCE::ID = 0;
   RegisterPass X("globaldce", "Dead Global Elimination");
 }
 


Index: llvm/lib/Transforms/IPO/GlobalOpt.cpp
diff -u llvm/lib/Transforms/IPO/GlobalOpt.cpp:1.103 llvm/lib/Transforms/IPO/GlobalOpt.cpp:1.104
--- llvm/lib/Transforms/IPO/GlobalOpt.cpp:1.103	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/IPO/GlobalOpt.cpp	Wed May  2 20:11:54 2007
@@ -50,7 +50,7 @@
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
       AU.addRequired();
     }
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     GlobalOpt() : ModulePass((intptr_t)&ID) {}
 
     bool runOnModule(Module &M);
@@ -63,7 +63,7 @@
     bool ProcessInternalGlobal(GlobalVariable *GV,Module::global_iterator &GVI);
   };
 
-  const char GlobalOpt::ID = 0;
+  char GlobalOpt::ID = 0;
   RegisterPass X("globalopt", "Global Variable Optimizer");
 }
 


Index: llvm/lib/Transforms/IPO/IPConstantPropagation.cpp
diff -u llvm/lib/Transforms/IPO/IPConstantPropagation.cpp:1.25 llvm/lib/Transforms/IPO/IPConstantPropagation.cpp:1.26
--- llvm/lib/Transforms/IPO/IPConstantPropagation.cpp:1.25	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/IPO/IPConstantPropagation.cpp	Wed May  2 20:11:54 2007
@@ -33,7 +33,7 @@
   /// IPCP - The interprocedural constant propagation pass
   ///
   struct VISIBILITY_HIDDEN IPCP : public ModulePass {
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     IPCP() : ModulePass((intptr_t)&ID) {}
 
     bool runOnModule(Module &M);
@@ -41,7 +41,7 @@
     bool PropagateConstantsIntoArguments(Function &F);
     bool PropagateConstantReturn(Function &F);
   };
-  const char IPCP::ID = 0;
+  char IPCP::ID = 0;
   RegisterPass X("ipconstprop", "Interprocedural constant propagation");
 }
 


Index: llvm/lib/Transforms/IPO/IndMemRemoval.cpp
diff -u llvm/lib/Transforms/IPO/IndMemRemoval.cpp:1.17 llvm/lib/Transforms/IPO/IndMemRemoval.cpp:1.18
--- llvm/lib/Transforms/IPO/IndMemRemoval.cpp:1.17	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/IPO/IndMemRemoval.cpp	Wed May  2 20:11:54 2007
@@ -32,12 +32,12 @@
 namespace {
   class VISIBILITY_HIDDEN IndMemRemPass : public ModulePass {
   public:
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     IndMemRemPass() : ModulePass((intptr_t)&ID) {}
 
     virtual bool runOnModule(Module &M);
   };
-  const char IndMemRemPass::ID = 0;
+  char IndMemRemPass::ID = 0;
   RegisterPass X("indmemrem","Indirect Malloc and Free Removal");
 } // end anonymous namespace
 


Index: llvm/lib/Transforms/IPO/InlineSimple.cpp
diff -u llvm/lib/Transforms/IPO/InlineSimple.cpp:1.80 llvm/lib/Transforms/IPO/InlineSimple.cpp:1.81
--- llvm/lib/Transforms/IPO/InlineSimple.cpp:1.80	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/IPO/InlineSimple.cpp	Wed May  2 20:11:54 2007
@@ -54,10 +54,10 @@
   class VISIBILITY_HIDDEN SimpleInliner : public Inliner {
     std::map CachedFunctionInfo;
   public:
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     int getInlineCost(CallSite CS);
   };
-  const char SimpleInliner::ID = 0;
+  char SimpleInliner::ID = 0;
   RegisterPass X("inline", "Function Integration/Inlining");
 }
 


Index: llvm/lib/Transforms/IPO/Inliner.cpp
diff -u llvm/lib/Transforms/IPO/Inliner.cpp:1.39 llvm/lib/Transforms/IPO/Inliner.cpp:1.40
--- llvm/lib/Transforms/IPO/Inliner.cpp:1.39	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/IPO/Inliner.cpp	Wed May  2 20:11:54 2007
@@ -36,7 +36,7 @@
         cl::desc("Control the amount of inlining to perform (default = 200)"));
 }
 
-const char Inliner::ID = 0;
+char Inliner::ID = 0;
 Inliner::Inliner() 
   : CallGraphSCCPass((intptr_t)&ID), InlineThreshold(InlineLimit) {}
 


Index: llvm/lib/Transforms/IPO/Inliner.h
diff -u llvm/lib/Transforms/IPO/Inliner.h:1.11 llvm/lib/Transforms/IPO/Inliner.h:1.12
--- llvm/lib/Transforms/IPO/Inliner.h:1.11	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/IPO/Inliner.h	Wed May  2 20:11:54 2007
@@ -27,7 +27,7 @@
 /// perform the inlining operations that does not depend on the policy.
 ///
 struct Inliner : public CallGraphSCCPass {
-  static const char ID;
+  static char ID;
   Inliner();
 
   /// getAnalysisUsage - For this class, we declare that we require and preserve


Index: llvm/lib/Transforms/IPO/Internalize.cpp
diff -u llvm/lib/Transforms/IPO/Internalize.cpp:1.47 llvm/lib/Transforms/IPO/Internalize.cpp:1.48
--- llvm/lib/Transforms/IPO/Internalize.cpp:1.47	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/IPO/Internalize.cpp	Wed May  2 20:11:54 2007
@@ -46,13 +46,13 @@
     std::set ExternalNames;
     bool DontInternalize;
   public:
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     InternalizePass(bool InternalizeEverything = true);
     InternalizePass(const std::vector & exportList);
     void LoadFile(const char *Filename);
     virtual bool runOnModule(Module &M);
   };
-  const char InternalizePass::ID = 0;
+  char InternalizePass::ID = 0;
   RegisterPass X("internalize", "Internalize Global Symbols");
 } // end anonymous namespace
 


Index: llvm/lib/Transforms/IPO/LoopExtractor.cpp
diff -u llvm/lib/Transforms/IPO/LoopExtractor.cpp:1.26 llvm/lib/Transforms/IPO/LoopExtractor.cpp:1.27
--- llvm/lib/Transforms/IPO/LoopExtractor.cpp:1.26	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/IPO/LoopExtractor.cpp	Wed May  2 20:11:54 2007
@@ -34,7 +34,7 @@
   // Module passes to require FunctionPasses, so we can't get loop info if we're
   // not a function pass.
   struct VISIBILITY_HIDDEN LoopExtractor : public FunctionPass {
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     unsigned NumLoops;
 
     LoopExtractor(unsigned numLoops = ~0) 
@@ -51,17 +51,17 @@
     }
   };
 
-  const char LoopExtractor::ID = 0;
+  char LoopExtractor::ID = 0;
   RegisterPass
   X("loop-extract", "Extract loops into new functions");
 
   /// SingleLoopExtractor - For bugpoint.
   struct SingleLoopExtractor : public LoopExtractor {
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     SingleLoopExtractor() : LoopExtractor(1) {}
   };
 
-  const char SingleLoopExtractor::ID = 0;
+  char SingleLoopExtractor::ID = 0;
   RegisterPass
   Y("loop-extract-single", "Extract at most one loop into a new function");
 } // End anonymous namespace
@@ -152,7 +152,7 @@
   class BlockExtractorPass : public ModulePass {
     std::vector BlocksToNotExtract;
   public:
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     BlockExtractorPass(std::vector &B) 
       : ModulePass((intptr_t)&ID), BlocksToNotExtract(B) {}
     BlockExtractorPass() : ModulePass((intptr_t)&ID) {}
@@ -160,7 +160,7 @@
     bool runOnModule(Module &M);
   };
 
-  const char BlockExtractorPass::ID = 0;
+  char BlockExtractorPass::ID = 0;
   RegisterPass
   XX("extract-blocks", "Extract Basic Blocks From Module (for bugpoint use)");
 }


Index: llvm/lib/Transforms/IPO/LowerSetJmp.cpp
diff -u llvm/lib/Transforms/IPO/LowerSetJmp.cpp:1.42 llvm/lib/Transforms/IPO/LowerSetJmp.cpp:1.43
--- llvm/lib/Transforms/IPO/LowerSetJmp.cpp:1.42	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/IPO/LowerSetJmp.cpp	Wed May  2 20:11:54 2007
@@ -109,7 +109,7 @@
 
     bool IsTransformableFunction(const std::string& Name);
   public:
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     LowerSetJmp() : ModulePass((intptr_t)&ID) {}
 
     void visitCallInst(CallInst& CI);
@@ -121,7 +121,7 @@
     bool doInitialization(Module& M);
   };
 
-  const char LowerSetJmp::ID = 0;
+  char LowerSetJmp::ID = 0;
   RegisterPass X("lowersetjmp", "Lower Set Jump");
 } // end anonymous namespace
 


Index: llvm/lib/Transforms/IPO/PruneEH.cpp
diff -u llvm/lib/Transforms/IPO/PruneEH.cpp:1.33 llvm/lib/Transforms/IPO/PruneEH.cpp:1.34
--- llvm/lib/Transforms/IPO/PruneEH.cpp:1.33	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/IPO/PruneEH.cpp	Wed May  2 20:11:54 2007
@@ -35,7 +35,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN PruneEH : public CallGraphSCCPass {
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     PruneEH() : CallGraphSCCPass((intptr_t)&ID) {}
 
     /// DoesNotUnwind - This set contains all of the functions which we have
@@ -53,7 +53,7 @@
     void DeleteBasicBlock(BasicBlock *BB);
   };
 
-  const char PruneEH::ID = 0;
+  char PruneEH::ID = 0;
   RegisterPass X("prune-eh", "Remove unused exception handling info");
 }
 


Index: llvm/lib/Transforms/IPO/RaiseAllocations.cpp
diff -u llvm/lib/Transforms/IPO/RaiseAllocations.cpp:1.42 llvm/lib/Transforms/IPO/RaiseAllocations.cpp:1.43
--- llvm/lib/Transforms/IPO/RaiseAllocations.cpp:1.42	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/IPO/RaiseAllocations.cpp	Wed May  2 20:11:54 2007
@@ -35,7 +35,7 @@
     Function *MallocFunc;   // Functions in the module we are processing
     Function *FreeFunc;     // Initialized by doPassInitializationVirt
   public:
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     RaiseAllocations() 
       : ModulePass((intptr_t)&ID), MallocFunc(0), FreeFunc(0) {}
 
@@ -49,7 +49,7 @@
     bool runOnModule(Module &M);
   };
 
-  const char RaiseAllocations::ID = 0;
+  char RaiseAllocations::ID = 0;
   RegisterPass
   X("raiseallocs", "Raise allocations from calls to instructions");
 }  // end anonymous namespace


Index: llvm/lib/Transforms/IPO/SimplifyLibCalls.cpp
diff -u llvm/lib/Transforms/IPO/SimplifyLibCalls.cpp:1.114 llvm/lib/Transforms/IPO/SimplifyLibCalls.cpp:1.115
--- llvm/lib/Transforms/IPO/SimplifyLibCalls.cpp:1.114	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/IPO/SimplifyLibCalls.cpp	Wed May  2 20:11:54 2007
@@ -152,7 +152,7 @@
 /// @brief A ModulePass for optimizing well-known function calls.
 class VISIBILITY_HIDDEN SimplifyLibCalls : public ModulePass {
 public:
-  static const char ID; // Pass identifcation, replacement for typeid
+  static char ID; // Pass identifcation, replacement for typeid
   SimplifyLibCalls() : ModulePass((intptr_t)&ID) {}
 
   /// We need some target data for accurate signature details that are
@@ -376,7 +376,7 @@
   TargetData *TD;        ///< Cached TargetData
 };
 
-const char SimplifyLibCalls::ID = 0;
+char SimplifyLibCalls::ID = 0;
 // Register the pass
 RegisterPass
 X("simplify-libcalls", "Simplify well-known library calls");


Index: llvm/lib/Transforms/IPO/StripDeadPrototypes.cpp
diff -u llvm/lib/Transforms/IPO/StripDeadPrototypes.cpp:1.7 llvm/lib/Transforms/IPO/StripDeadPrototypes.cpp:1.8
--- llvm/lib/Transforms/IPO/StripDeadPrototypes.cpp:1.7	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/IPO/StripDeadPrototypes.cpp	Wed May  2 20:11:54 2007
@@ -27,12 +27,12 @@
 /// @brief Pass to remove unused function declarations.
 class VISIBILITY_HIDDEN StripDeadPrototypesPass : public ModulePass {
 public:
-  static const char ID; // Pass identifcation, replacement for typeid
+  static char ID; // Pass identifcation, replacement for typeid
   StripDeadPrototypesPass() : ModulePass((intptr_t)&ID) { }
   virtual bool runOnModule(Module &M);
 };
 
-const char StripDeadPrototypesPass::ID = 0;
+char StripDeadPrototypesPass::ID = 0;
 RegisterPass X("strip-dead-prototypes", 
                                         "Strip Unused Function Prototypes");
 


Index: llvm/lib/Transforms/IPO/StripSymbols.cpp
diff -u llvm/lib/Transforms/IPO/StripSymbols.cpp:1.17 llvm/lib/Transforms/IPO/StripSymbols.cpp:1.18
--- llvm/lib/Transforms/IPO/StripSymbols.cpp:1.17	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/IPO/StripSymbols.cpp	Wed May  2 20:11:54 2007
@@ -37,7 +37,7 @@
   class VISIBILITY_HIDDEN StripSymbols : public ModulePass {
     bool OnlyDebugInfo;
   public:
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     StripSymbols(bool ODI = false) 
       : ModulePass((intptr_t)&ID), OnlyDebugInfo(ODI) {}
 
@@ -48,7 +48,7 @@
     }
   };
 
-  const char StripSymbols::ID = 0;
+  char StripSymbols::ID = 0;
   RegisterPass X("strip", "Strip all symbols from a module");
 }
 





From dpatel at apple.com  Wed May  2 20:14:09 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 20:14:09 -0500
Subject: [llvm-commits] CVS:
	llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h
Message-ID: <200705030114.l431E9cP030189@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Transforms/Utils:

UnifyFunctionExitNodes.h updated: 1.22 -> 1.23
---
Log message:

Drop 'const'


---
Diffs of the changes:  (+1 -1)

 UnifyFunctionExitNodes.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h
diff -u llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h:1.22 llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h:1.23
--- llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h:1.22	Wed May  2 16:39:18 2007
+++ llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h	Wed May  2 20:11:53 2007
@@ -25,7 +25,7 @@
 struct UnifyFunctionExitNodes : public FunctionPass {
   BasicBlock *ReturnBlock, *UnwindBlock, *UnreachableBlock;
 public:
-  static const char ID; // Pass identifcation, replacement for typeid
+  static char ID; // Pass identifcation, replacement for typeid
   UnifyFunctionExitNodes() : FunctionPass((intptr_t)&ID),
                              ReturnBlock(0), UnwindBlock(0) {}
 





From dpatel at apple.com  Wed May  2 20:14:09 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 20:14:09 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Hello/Hello.cpp
Message-ID: <200705030114.l431E9dA030210@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Hello:

Hello.cpp updated: 1.16 -> 1.17
---
Log message:

Drop 'const'


---
Diffs of the changes:  (+4 -4)

 Hello.cpp |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Index: llvm/lib/Transforms/Hello/Hello.cpp
diff -u llvm/lib/Transforms/Hello/Hello.cpp:1.16 llvm/lib/Transforms/Hello/Hello.cpp:1.17
--- llvm/lib/Transforms/Hello/Hello.cpp:1.16	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Hello/Hello.cpp	Wed May  2 20:11:54 2007
@@ -25,7 +25,7 @@
 namespace {
   // Hello - The first implementation, without getAnalysisUsage.
   struct Hello : public FunctionPass {
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     Hello() : FunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnFunction(Function &F) {
@@ -37,12 +37,12 @@
     }
   };
 
-  const char Hello::ID = 0;
+  char Hello::ID = 0;
   RegisterPass X("hello", "Hello World Pass");
 
   // Hello2 - The second implementation with getAnalysisUsage implemented.
   struct Hello2 : public FunctionPass {
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     Hello2() : FunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnFunction(Function &F) {
@@ -58,7 +58,7 @@
       AU.setPreservesAll();
     };
   };
-  const char Hello2::ID = 0;
+  char Hello2::ID = 0;
   RegisterPass Y("hello2",
                         "Hello World Pass (with getAnalysisUsage implemented)");
 }





From dpatel at apple.com  Wed May  2 20:14:10 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 20:14:10 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Analysis/AliasAnalysis.h
	CallGraph.h Dominators.h FindUsedTypes.h IntervalPartition.h
	LoopInfo.h LoopPass.h PostDominators.h ProfileInfo.h
	ScalarEvolution.h ValueNumbering.h
Message-ID: <200705030114.l431EA9t030252@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Analysis:

AliasAnalysis.h updated: 1.30 -> 1.31
CallGraph.h updated: 1.55 -> 1.56
Dominators.h updated: 1.78 -> 1.79
FindUsedTypes.h updated: 1.31 -> 1.32
IntervalPartition.h updated: 1.25 -> 1.26
LoopInfo.h updated: 1.65 -> 1.66
LoopPass.h updated: 1.17 -> 1.18
PostDominators.h updated: 1.19 -> 1.20
ProfileInfo.h updated: 1.7 -> 1.8
ScalarEvolution.h updated: 1.18 -> 1.19
ValueNumbering.h updated: 1.12 -> 1.13
---
Log message:

Drop 'const'


---
Diffs of the changes:  (+15 -15)

 AliasAnalysis.h     |    2 +-
 CallGraph.h         |    2 +-
 Dominators.h        |    6 +++---
 FindUsedTypes.h     |    2 +-
 IntervalPartition.h |    2 +-
 LoopInfo.h          |    2 +-
 LoopPass.h          |    2 +-
 PostDominators.h    |    6 +++---
 ProfileInfo.h       |    2 +-
 ScalarEvolution.h   |    2 +-
 ValueNumbering.h    |    2 +-
 11 files changed, 15 insertions(+), 15 deletions(-)


Index: llvm/include/llvm/Analysis/AliasAnalysis.h
diff -u llvm/include/llvm/Analysis/AliasAnalysis.h:1.30 llvm/include/llvm/Analysis/AliasAnalysis.h:1.31
--- llvm/include/llvm/Analysis/AliasAnalysis.h:1.30	Wed May  2 16:39:18 2007
+++ llvm/include/llvm/Analysis/AliasAnalysis.h	Wed May  2 20:11:53 2007
@@ -61,7 +61,7 @@
   virtual void getAnalysisUsage(AnalysisUsage &AU) const;
 
 public:
-  static const char ID; // Class identification, replacement for typeinfo
+  static char ID; // Class identification, replacement for typeinfo
   AliasAnalysis() : TD(0), AA(0) {}
   virtual ~AliasAnalysis();  // We want to be subclassed
 


Index: llvm/include/llvm/Analysis/CallGraph.h
diff -u llvm/include/llvm/Analysis/CallGraph.h:1.55 llvm/include/llvm/Analysis/CallGraph.h:1.56
--- llvm/include/llvm/Analysis/CallGraph.h:1.55	Wed May  2 16:39:18 2007
+++ llvm/include/llvm/Analysis/CallGraph.h	Wed May  2 20:11:53 2007
@@ -73,7 +73,7 @@
   FunctionMapTy FunctionMap;    // Map from a function to its node
 
 public:
-  static const char ID; // Class identification, replacement for typeinfo
+  static char ID; // Class identification, replacement for typeinfo
   //===---------------------------------------------------------------------
   // Accessors...
   //


Index: llvm/include/llvm/Analysis/Dominators.h
diff -u llvm/include/llvm/Analysis/Dominators.h:1.78 llvm/include/llvm/Analysis/Dominators.h:1.79
--- llvm/include/llvm/Analysis/Dominators.h:1.78	Wed May  2 16:39:18 2007
+++ llvm/include/llvm/Analysis/Dominators.h	Wed May  2 20:11:53 2007
@@ -208,7 +208,7 @@
 ///
 class DominatorTree : public DominatorTreeBase {
 public:
-  static const char ID; // Pass ID, replacement for typeid
+  static char ID; // Pass ID, replacement for typeid
   DominatorTree() : DominatorTreeBase((intptr_t)&ID, false) {}
   
   BasicBlock *getRoot() const {
@@ -399,7 +399,7 @@
 
 class ETForest : public ETForestBase {
 public:
-  static const char ID; // Pass identifcation, replacement for typeid
+  static char ID; // Pass identifcation, replacement for typeid
 
   ETForest() : ETForestBase((intptr_t)&ID, false) {}
 
@@ -477,7 +477,7 @@
 ///
 class DominanceFrontier : public DominanceFrontierBase {
 public:
-  static const char ID; // Pass ID, replacement for typeid
+  static char ID; // Pass ID, replacement for typeid
   DominanceFrontier() : 
     DominanceFrontierBase((intptr_t)& ID, false) {}
 


Index: llvm/include/llvm/Analysis/FindUsedTypes.h
diff -u llvm/include/llvm/Analysis/FindUsedTypes.h:1.31 llvm/include/llvm/Analysis/FindUsedTypes.h:1.32
--- llvm/include/llvm/Analysis/FindUsedTypes.h:1.31	Wed May  2 16:39:18 2007
+++ llvm/include/llvm/Analysis/FindUsedTypes.h	Wed May  2 20:11:53 2007
@@ -24,7 +24,7 @@
 class FindUsedTypes : public ModulePass {
   std::set UsedTypes;
 public:
-  static const char ID; // Pass identifcation, replacement for typeid
+  static char ID; // Pass identifcation, replacement for typeid
   FindUsedTypes() : ModulePass((intptr_t)&ID) {}
 
   /// getTypes - After the pass has been run, return the set containing all of


Index: llvm/include/llvm/Analysis/IntervalPartition.h
diff -u llvm/include/llvm/Analysis/IntervalPartition.h:1.25 llvm/include/llvm/Analysis/IntervalPartition.h:1.26
--- llvm/include/llvm/Analysis/IntervalPartition.h:1.25	Wed May  2 16:39:18 2007
+++ llvm/include/llvm/Analysis/IntervalPartition.h	Wed May  2 20:11:53 2007
@@ -45,7 +45,7 @@
   std::vector Intervals;
 
 public:
-  static const char ID; // Pass identifcation, replacement for typeid
+  static char ID; // Pass identifcation, replacement for typeid
 
   IntervalPartition() : FunctionPass((intptr_t)&ID), RootInterval(0) {}
 


Index: llvm/include/llvm/Analysis/LoopInfo.h
diff -u llvm/include/llvm/Analysis/LoopInfo.h:1.65 llvm/include/llvm/Analysis/LoopInfo.h:1.66
--- llvm/include/llvm/Analysis/LoopInfo.h:1.65	Wed May  2 16:39:18 2007
+++ llvm/include/llvm/Analysis/LoopInfo.h	Wed May  2 20:11:53 2007
@@ -241,7 +241,7 @@
   std::vector TopLevelLoops;
   friend class Loop;
 public:
-  static const char ID; // Pass identifcation, replacement for typeid
+  static char ID; // Pass identifcation, replacement for typeid
 
   LoopInfo() : FunctionPass((intptr_t)&ID) {}
   ~LoopInfo() { releaseMemory(); }


Index: llvm/include/llvm/Analysis/LoopPass.h
diff -u llvm/include/llvm/Analysis/LoopPass.h:1.17 llvm/include/llvm/Analysis/LoopPass.h:1.18
--- llvm/include/llvm/Analysis/LoopPass.h:1.17	Wed May  2 16:39:18 2007
+++ llvm/include/llvm/Analysis/LoopPass.h	Wed May  2 20:11:53 2007
@@ -68,7 +68,7 @@
 class LPPassManager : public FunctionPass, public PMDataManager {
 
 public:
-  static const char ID;
+  static char ID;
   LPPassManager(int Depth);
 
   /// run - Execute all of the passes scheduled for execution.  Keep track of


Index: llvm/include/llvm/Analysis/PostDominators.h
diff -u llvm/include/llvm/Analysis/PostDominators.h:1.19 llvm/include/llvm/Analysis/PostDominators.h:1.20
--- llvm/include/llvm/Analysis/PostDominators.h:1.19	Wed May  2 16:39:18 2007
+++ llvm/include/llvm/Analysis/PostDominators.h	Wed May  2 20:11:53 2007
@@ -22,7 +22,7 @@
 /// compute the a post-dominator tree.
 ///
 struct PostDominatorTree : public DominatorTreeBase {
-  static const char ID; // Pass identifcation, replacement for typeid
+  static char ID; // Pass identifcation, replacement for typeid
 
   PostDominatorTree() : 
     DominatorTreeBase((intptr_t)&ID, true) {}
@@ -54,7 +54,7 @@
 /// PostETForest Class - Concrete subclass of ETForestBase that is used to
 /// compute a forwards post-dominator ET-Forest.
 struct PostETForest : public ETForestBase {
-  static const char ID;
+  static char ID;
   PostETForest() : ETForestBase((intptr_t)&ID, true) {}
 
   virtual void getAnalysisUsage(AnalysisUsage &AU) const {
@@ -79,7 +79,7 @@
 /// used to compute the a post-dominance frontier.
 ///
 struct PostDominanceFrontier : public DominanceFrontierBase {
-  static const char ID;
+  static char ID;
   PostDominanceFrontier() 
     : DominanceFrontierBase((intptr_t) &ID, true) {}
 


Index: llvm/include/llvm/Analysis/ProfileInfo.h
diff -u llvm/include/llvm/Analysis/ProfileInfo.h:1.7 llvm/include/llvm/Analysis/ProfileInfo.h:1.8
--- llvm/include/llvm/Analysis/ProfileInfo.h:1.7	Wed May  2 16:39:18 2007
+++ llvm/include/llvm/Analysis/ProfileInfo.h	Wed May  2 20:11:53 2007
@@ -38,7 +38,7 @@
     // entered.
     std::map, unsigned> EdgeCounts;
   public:
-    static const char ID; // Class identification, replacement for typeinfo
+    static char ID; // Class identification, replacement for typeinfo
     virtual ~ProfileInfo();  // We want to be subclassed
 
     //===------------------------------------------------------------------===//


Index: llvm/include/llvm/Analysis/ScalarEvolution.h
diff -u llvm/include/llvm/Analysis/ScalarEvolution.h:1.18 llvm/include/llvm/Analysis/ScalarEvolution.h:1.19
--- llvm/include/llvm/Analysis/ScalarEvolution.h:1.18	Wed May  2 16:39:18 2007
+++ llvm/include/llvm/Analysis/ScalarEvolution.h	Wed May  2 20:11:53 2007
@@ -197,7 +197,7 @@
   class ScalarEvolution : public FunctionPass {
     void *Impl;    // ScalarEvolution uses the pimpl pattern
   public:
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     ScalarEvolution() : FunctionPass((intptr_t)&ID), Impl(0) {}
 
     /// getSCEV - Return a SCEV expression handle for the full generality of the


Index: llvm/include/llvm/Analysis/ValueNumbering.h
diff -u llvm/include/llvm/Analysis/ValueNumbering.h:1.12 llvm/include/llvm/Analysis/ValueNumbering.h:1.13
--- llvm/include/llvm/Analysis/ValueNumbering.h:1.12	Wed May  2 16:39:18 2007
+++ llvm/include/llvm/Analysis/ValueNumbering.h	Wed May  2 20:11:53 2007
@@ -29,7 +29,7 @@
 class Instruction;
 
 struct ValueNumbering {
-  static const char ID; // Class identification, replacement for typeinfo
+  static char ID; // Class identification, replacement for typeinfo
   virtual ~ValueNumbering();    // We want to be subclassed
 
   /// getEqualNumberNodes - Return nodes with the same value number as the





From dpatel at apple.com  Wed May  2 20:14:10 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 20:14:10 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp LCSSA.cpp
	LoopSimplify.cpp LowerAllocations.cpp LowerInvoke.cpp
	LowerSelect.cpp LowerSwitch.cpp Mem2Reg.cpp
	UnifyFunctionExitNodes.cpp
Message-ID: <200705030114.l431EA6Y030298@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Utils:

BreakCriticalEdges.cpp updated: 1.46 -> 1.47
LCSSA.cpp updated: 1.40 -> 1.41
LoopSimplify.cpp updated: 1.94 -> 1.95
LowerAllocations.cpp updated: 1.75 -> 1.76
LowerInvoke.cpp updated: 1.61 -> 1.62
LowerSelect.cpp updated: 1.14 -> 1.15
LowerSwitch.cpp updated: 1.40 -> 1.41
Mem2Reg.cpp updated: 1.28 -> 1.29
UnifyFunctionExitNodes.cpp updated: 1.38 -> 1.39
---
Log message:

Drop 'const'


---
Diffs of the changes:  (+17 -17)

 BreakCriticalEdges.cpp     |    4 ++--
 LCSSA.cpp                  |    4 ++--
 LoopSimplify.cpp           |    4 ++--
 LowerAllocations.cpp       |    4 ++--
 LowerInvoke.cpp            |    4 ++--
 LowerSelect.cpp            |    4 ++--
 LowerSwitch.cpp            |    4 ++--
 Mem2Reg.cpp                |    4 ++--
 UnifyFunctionExitNodes.cpp |    2 +-
 9 files changed, 17 insertions(+), 17 deletions(-)


Index: llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp
diff -u llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp:1.46 llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp:1.47
--- llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp:1.46	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp	Wed May  2 20:11:54 2007
@@ -34,7 +34,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN BreakCriticalEdges : public FunctionPass {
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     BreakCriticalEdges() : FunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnFunction(Function &F);
@@ -50,7 +50,7 @@
     }
   };
 
-  const char BreakCriticalEdges::ID = 0;
+  char BreakCriticalEdges::ID = 0;
   RegisterPass X("break-crit-edges",
                                     "Break critical edges in CFG");
 }


Index: llvm/lib/Transforms/Utils/LCSSA.cpp
diff -u llvm/lib/Transforms/Utils/LCSSA.cpp:1.40 llvm/lib/Transforms/Utils/LCSSA.cpp:1.41
--- llvm/lib/Transforms/Utils/LCSSA.cpp:1.40	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Utils/LCSSA.cpp	Wed May  2 20:11:54 2007
@@ -47,7 +47,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN LCSSA : public FunctionPass {
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     LCSSA() : FunctionPass((intptr_t)&ID) {}
 
     // Cached analysis information for the current function.
@@ -84,7 +84,7 @@
     }
   };
   
-  const char LCSSA::ID = 0;
+  char LCSSA::ID = 0;
   RegisterPass X("lcssa", "Loop-Closed SSA Form Pass");
 }
 


Index: llvm/lib/Transforms/Utils/LoopSimplify.cpp
diff -u llvm/lib/Transforms/Utils/LoopSimplify.cpp:1.94 llvm/lib/Transforms/Utils/LoopSimplify.cpp:1.95
--- llvm/lib/Transforms/Utils/LoopSimplify.cpp:1.94	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Utils/LoopSimplify.cpp	Wed May  2 20:11:54 2007
@@ -54,7 +54,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN LoopSimplify : public FunctionPass {
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     LoopSimplify() : FunctionPass((intptr_t)&ID) {}
 
     // AA - If we have an alias analysis object to update, this is it, otherwise
@@ -92,7 +92,7 @@
                                          std::vector &PredBlocks);
   };
 
-  const char LoopSimplify::ID = 0;
+  char LoopSimplify::ID = 0;
   RegisterPass
   X("loopsimplify", "Canonicalize natural loops", true);
 }


Index: llvm/lib/Transforms/Utils/LowerAllocations.cpp
diff -u llvm/lib/Transforms/Utils/LowerAllocations.cpp:1.75 llvm/lib/Transforms/Utils/LowerAllocations.cpp:1.76
--- llvm/lib/Transforms/Utils/LowerAllocations.cpp:1.75	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Utils/LowerAllocations.cpp	Wed May  2 20:11:54 2007
@@ -36,7 +36,7 @@
     Constant *FreeFunc;     // Initialized by doInitialization
     bool LowerMallocArgToInteger;
   public:
-    static const char ID; // Pass ID, replacement for typeid
+    static char ID; // Pass ID, replacement for typeid
     LowerAllocations(bool LowerToInt = false)
       : BasicBlockPass((intptr_t)&ID), MallocFunc(0), FreeFunc(0), 
         LowerMallocArgToInteger(LowerToInt) {}
@@ -68,7 +68,7 @@
     bool runOnBasicBlock(BasicBlock &BB);
   };
 
-  const char LowerAllocations::ID = 0;
+  char LowerAllocations::ID = 0;
   RegisterPass
   X("lowerallocs", "Lower allocations from instructions to calls");
 }


Index: llvm/lib/Transforms/Utils/LowerInvoke.cpp
diff -u llvm/lib/Transforms/Utils/LowerInvoke.cpp:1.61 llvm/lib/Transforms/Utils/LowerInvoke.cpp:1.62
--- llvm/lib/Transforms/Utils/LowerInvoke.cpp:1.61	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Utils/LowerInvoke.cpp	Wed May  2 20:11:54 2007
@@ -75,7 +75,7 @@
     const TargetLowering *TLI;
     
   public:
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     LowerInvoke(const TargetLowering *tli = NULL) : FunctionPass((intptr_t)&ID),
       TLI(tli) { }
     bool doInitialization(Module &M);
@@ -99,7 +99,7 @@
     bool insertExpensiveEHSupport(Function &F);
   };
 
-  const char LowerInvoke::ID = 0;
+  char LowerInvoke::ID = 0;
   RegisterPass
   X("lowerinvoke", "Lower invoke and unwind, for unwindless code generators");
 }


Index: llvm/lib/Transforms/Utils/LowerSelect.cpp
diff -u llvm/lib/Transforms/Utils/LowerSelect.cpp:1.14 llvm/lib/Transforms/Utils/LowerSelect.cpp:1.15
--- llvm/lib/Transforms/Utils/LowerSelect.cpp:1.14	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Utils/LowerSelect.cpp	Wed May  2 20:11:54 2007
@@ -33,7 +33,7 @@
   class VISIBILITY_HIDDEN LowerSelect : public FunctionPass {
     bool OnlyFP;   // Only lower FP select instructions?
   public:
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     LowerSelect(bool onlyfp = false) : FunctionPass((intptr_t)&ID), 
       OnlyFP(onlyfp) {}
 
@@ -50,7 +50,7 @@
     bool runOnFunction(Function &F);
   };
 
-  const char LowerSelect::ID = 0;
+  char LowerSelect::ID = 0;
   RegisterPass
   X("lowerselect", "Lower select instructions to branches");
 }


Index: llvm/lib/Transforms/Utils/LowerSwitch.cpp
diff -u llvm/lib/Transforms/Utils/LowerSwitch.cpp:1.40 llvm/lib/Transforms/Utils/LowerSwitch.cpp:1.41
--- llvm/lib/Transforms/Utils/LowerSwitch.cpp:1.40	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Utils/LowerSwitch.cpp	Wed May  2 20:11:54 2007
@@ -30,7 +30,7 @@
   /// modifies the CFG!
   class VISIBILITY_HIDDEN LowerSwitch : public FunctionPass {
   public:
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     LowerSwitch() : FunctionPass((intptr_t) &ID) {} 
 
     virtual bool runOnFunction(Function &F);
@@ -78,7 +78,7 @@
     }
   };
 
-  const char LowerSwitch::ID = 0;
+  char LowerSwitch::ID = 0;
   RegisterPass
   X("lowerswitch", "Lower SwitchInst's to branches");
 }


Index: llvm/lib/Transforms/Utils/Mem2Reg.cpp
diff -u llvm/lib/Transforms/Utils/Mem2Reg.cpp:1.28 llvm/lib/Transforms/Utils/Mem2Reg.cpp:1.29
--- llvm/lib/Transforms/Utils/Mem2Reg.cpp:1.28	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Utils/Mem2Reg.cpp	Wed May  2 20:11:54 2007
@@ -27,7 +27,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN PromotePass : public FunctionPass {
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     PromotePass() : FunctionPass((intptr_t)&ID) {}
 
     // runOnFunction - To run this pass, first we calculate the alloca
@@ -50,7 +50,7 @@
     }
   };
 
-  const char PromotePass::ID = 0;
+  char PromotePass::ID = 0;
   RegisterPass X("mem2reg", "Promote Memory to Register");
 }  // end of anonymous namespace
 


Index: llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp
diff -u llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp:1.38 llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp:1.39
--- llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp:1.38	Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp	Wed May  2 20:11:54 2007
@@ -22,7 +22,7 @@
 #include "llvm/Type.h"
 using namespace llvm;
 
-const char UnifyFunctionExitNodes::ID = 0;
+char UnifyFunctionExitNodes::ID = 0;
 static RegisterPass
 X("mergereturn", "Unify function exit nodes");
 





From dpatel at apple.com  Wed May  2 20:14:11 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 20:14:11 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Bytecode/WriteBytecodePass.h
Message-ID: <200705030114.l431EBZj030336@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Bytecode:

WriteBytecodePass.h updated: 1.21 -> 1.22
---
Log message:

Drop 'const'


---
Diffs of the changes:  (+1 -1)

 WriteBytecodePass.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/include/llvm/Bytecode/WriteBytecodePass.h
diff -u llvm/include/llvm/Bytecode/WriteBytecodePass.h:1.21 llvm/include/llvm/Bytecode/WriteBytecodePass.h:1.22
--- llvm/include/llvm/Bytecode/WriteBytecodePass.h:1.21	Wed May  2 16:39:18 2007
+++ llvm/include/llvm/Bytecode/WriteBytecodePass.h	Wed May  2 20:11:53 2007
@@ -26,7 +26,7 @@
   bool DeleteStream;
   bool CompressFile;
 public:
-  static const char ID; // Pass identifcation, replacement for typeid
+  static char ID; // Pass identifcation, replacement for typeid
   WriteBytecodePass()
     : ModulePass((intptr_t) &ID), Out(&cout), DeleteStream(false), 
       CompressFile(false) {}





From dpatel at apple.com  Wed May  2 20:14:10 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 20:14:10 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/Alpha/AlphaBranchSelector.cpp
	AlphaCodeEmitter.cpp AlphaLLRP.cpp
Message-ID: <200705030114.l431EAvu030265@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/Alpha:

AlphaBranchSelector.cpp updated: 1.4 -> 1.5
AlphaCodeEmitter.cpp updated: 1.23 -> 1.24
AlphaLLRP.cpp updated: 1.10 -> 1.11
---
Log message:

Drop 'const'


---
Diffs of the changes:  (+6 -6)

 AlphaBranchSelector.cpp |    4 ++--
 AlphaCodeEmitter.cpp    |    4 ++--
 AlphaLLRP.cpp           |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)


Index: llvm/lib/Target/Alpha/AlphaBranchSelector.cpp
diff -u llvm/lib/Target/Alpha/AlphaBranchSelector.cpp:1.4 llvm/lib/Target/Alpha/AlphaBranchSelector.cpp:1.5
--- llvm/lib/Target/Alpha/AlphaBranchSelector.cpp:1.4	Wed May  2 16:39:19 2007
+++ llvm/lib/Target/Alpha/AlphaBranchSelector.cpp	Wed May  2 20:11:53 2007
@@ -22,7 +22,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN AlphaBSel : public MachineFunctionPass {
-    static const char ID;
+    static char ID;
     AlphaBSel() : MachineFunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnMachineFunction(MachineFunction &Fn);
@@ -31,7 +31,7 @@
       return "Alpha Branch Selection";
     }
   };
-  const char AlphaBSel::ID = 0;
+  char AlphaBSel::ID = 0;
 }
 
 /// createAlphaBranchSelectionPass - returns an instance of the Branch Selection


Index: llvm/lib/Target/Alpha/AlphaCodeEmitter.cpp
diff -u llvm/lib/Target/Alpha/AlphaCodeEmitter.cpp:1.23 llvm/lib/Target/Alpha/AlphaCodeEmitter.cpp:1.24
--- llvm/lib/Target/Alpha/AlphaCodeEmitter.cpp:1.23	Wed May  2 16:39:19 2007
+++ llvm/lib/Target/Alpha/AlphaCodeEmitter.cpp	Wed May  2 20:11:53 2007
@@ -36,7 +36,7 @@
     int getMachineOpValue(MachineInstr &MI, MachineOperand &MO);
 
   public:
-    static const char ID;
+    static char ID;
     explicit AlphaCodeEmitter(TargetMachine &tm, MachineCodeEmitter &mce)
       : MachineFunctionPass((intptr_t)&ID), II(0), TM(tm), MCE(mce) {}
     AlphaCodeEmitter(TargetMachine &tm, MachineCodeEmitter &mce,
@@ -61,7 +61,7 @@
     void emitBasicBlock(MachineBasicBlock &MBB);
 
   };
-  const char AlphaCodeEmitter::ID = 0;
+  char AlphaCodeEmitter::ID = 0;
 }
 
 /// createAlphaCodeEmitterPass - Return a pass that emits the collected Alpha code


Index: llvm/lib/Target/Alpha/AlphaLLRP.cpp
diff -u llvm/lib/Target/Alpha/AlphaLLRP.cpp:1.10 llvm/lib/Target/Alpha/AlphaLLRP.cpp:1.11
--- llvm/lib/Target/Alpha/AlphaLLRP.cpp:1.10	Wed May  2 16:39:19 2007
+++ llvm/lib/Target/Alpha/AlphaLLRP.cpp	Wed May  2 20:11:53 2007
@@ -37,7 +37,7 @@
     ///
     AlphaTargetMachine &TM;
 
-    static const char ID;
+    static char ID;
     AlphaLLRPPass(AlphaTargetMachine &tm) 
       : MachineFunctionPass((intptr_t)&ID), TM(tm) { }
 
@@ -154,7 +154,7 @@
       return Changed;
     }
   };
-  const char AlphaLLRPPass::ID = 0;
+  char AlphaLLRPPass::ID = 0;
 } // end of anonymous namespace
 
 FunctionPass *llvm::createAlphaLLRPPass(AlphaTargetMachine &tm) {





From dpatel at apple.com  Wed May  2 20:14:10 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 20:14:10 -0500
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/AsmPrinter.cpp
	BranchFolding.cpp ELFWriter.cpp ELFWriter.h
	LiveIntervalAnalysis.cpp LiveVariables.cpp MachOWriter.cpp
	MachOWriter.h MachineFunction.cpp MachineModuleInfo.cpp
	PHIElimination.cpp PrologEpilogInserter.cpp
	RegAllocLinearScan.cpp RegAllocLocal.cpp RegAllocSimple.cpp
	TwoAddressInstructionPass.cpp UnreachableBlockElim.cpp
Message-ID: <200705030114.l431EA6K030288@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen:

AsmPrinter.cpp updated: 1.162 -> 1.163
BranchFolding.cpp updated: 1.48 -> 1.49
ELFWriter.cpp updated: 1.40 -> 1.41
ELFWriter.h updated: 1.3 -> 1.4
LiveIntervalAnalysis.cpp updated: 1.242 -> 1.243
LiveVariables.cpp updated: 1.81 -> 1.82
MachOWriter.cpp updated: 1.34 -> 1.35
MachOWriter.h updated: 1.5 -> 1.6
MachineFunction.cpp updated: 1.113 -> 1.114
MachineModuleInfo.cpp updated: 1.8 -> 1.9
PHIElimination.cpp updated: 1.59 -> 1.60
PrologEpilogInserter.cpp updated: 1.86 -> 1.87
RegAllocLinearScan.cpp updated: 1.147 -> 1.148
RegAllocLocal.cpp updated: 1.104 -> 1.105
RegAllocSimple.cpp updated: 1.85 -> 1.86
TwoAddressInstructionPass.cpp updated: 1.49 -> 1.50
UnreachableBlockElim.cpp updated: 1.11 -> 1.12
---
Log message:

Drop 'const'


---
Diffs of the changes:  (+30 -30)

 AsmPrinter.cpp                |    2 +-
 BranchFolding.cpp             |    4 ++--
 ELFWriter.cpp                 |    2 +-
 ELFWriter.h                   |    2 +-
 LiveIntervalAnalysis.cpp      |    2 +-
 LiveVariables.cpp             |    2 +-
 MachOWriter.cpp               |    2 +-
 MachOWriter.h                 |    2 +-
 MachineFunction.cpp           |    8 ++++----
 MachineModuleInfo.cpp         |    6 +++---
 PHIElimination.cpp            |    4 ++--
 PrologEpilogInserter.cpp      |    4 ++--
 RegAllocLinearScan.cpp        |    4 ++--
 RegAllocLocal.cpp             |    4 ++--
 RegAllocSimple.cpp            |    4 ++--
 TwoAddressInstructionPass.cpp |    4 ++--
 UnreachableBlockElim.cpp      |    4 ++--
 17 files changed, 30 insertions(+), 30 deletions(-)


Index: llvm/lib/CodeGen/AsmPrinter.cpp
diff -u llvm/lib/CodeGen/AsmPrinter.cpp:1.162 llvm/lib/CodeGen/AsmPrinter.cpp:1.163
--- llvm/lib/CodeGen/AsmPrinter.cpp:1.162	Wed May  2 16:39:18 2007
+++ llvm/lib/CodeGen/AsmPrinter.cpp	Wed May  2 20:11:53 2007
@@ -32,7 +32,7 @@
 static cl::opt
 AsmVerbose("asm-verbose", cl::Hidden, cl::desc("Add comments to directives."));
 
-const char AsmPrinter::ID = 0;
+char AsmPrinter::ID = 0;
 AsmPrinter::AsmPrinter(std::ostream &o, TargetMachine &tm,
                        const TargetAsmInfo *T)
   : MachineFunctionPass((intptr_t)&ID), FunctionNumber(0), O(o), TM(tm), TAI(T)


Index: llvm/lib/CodeGen/BranchFolding.cpp
diff -u llvm/lib/CodeGen/BranchFolding.cpp:1.48 llvm/lib/CodeGen/BranchFolding.cpp:1.49
--- llvm/lib/CodeGen/BranchFolding.cpp:1.48	Wed May  2 16:39:18 2007
+++ llvm/lib/CodeGen/BranchFolding.cpp	Wed May  2 20:11:53 2007
@@ -39,7 +39,7 @@
 
 namespace {
   struct BranchFolder : public MachineFunctionPass {
-    static const char ID;
+    static char ID;
     BranchFolder() : MachineFunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnMachineFunction(MachineFunction &MF);
@@ -67,7 +67,7 @@
                         MachineBasicBlock *TBB, MachineBasicBlock *FBB,
                         const std::vector &Cond);
   };
-  const char BranchFolder::ID = 0;
+  char BranchFolder::ID = 0;
 }
 
 FunctionPass *llvm::createBranchFoldingPass() { return new BranchFolder(); }


Index: llvm/lib/CodeGen/ELFWriter.cpp
diff -u llvm/lib/CodeGen/ELFWriter.cpp:1.40 llvm/lib/CodeGen/ELFWriter.cpp:1.41
--- llvm/lib/CodeGen/ELFWriter.cpp:1.40	Wed May  2 16:39:18 2007
+++ llvm/lib/CodeGen/ELFWriter.cpp	Wed May  2 20:11:53 2007
@@ -47,7 +47,7 @@
 #include 
 using namespace llvm;
 
-const char ELFWriter::ID = 0;
+char ELFWriter::ID = 0;
 /// AddELFWriter - Concrete function to add the ELF writer to the function pass
 /// manager.
 MachineCodeEmitter *llvm::AddELFWriter(FunctionPassManager &FPM,


Index: llvm/lib/CodeGen/ELFWriter.h
diff -u llvm/lib/CodeGen/ELFWriter.h:1.3 llvm/lib/CodeGen/ELFWriter.h:1.4
--- llvm/lib/CodeGen/ELFWriter.h:1.3	Wed May  2 16:39:18 2007
+++ llvm/lib/CodeGen/ELFWriter.h	Wed May  2 20:11:53 2007
@@ -30,7 +30,7 @@
   class ELFWriter : public MachineFunctionPass {
     friend class ELFCodeEmitter;
   public:
-    static const char ID;
+    static char ID;
 
     MachineCodeEmitter &getMachineCodeEmitter() const {
       return *(MachineCodeEmitter*)MCE;


Index: llvm/lib/CodeGen/LiveIntervalAnalysis.cpp
diff -u llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.242 llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.243
--- llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.242	Wed May  2 16:39:18 2007
+++ llvm/lib/CodeGen/LiveIntervalAnalysis.cpp	Wed May  2 20:11:53 2007
@@ -44,7 +44,7 @@
 STATISTIC(numFolded   , "Number of loads/stores folded into instructions");
 STATISTIC(numAborts   , "Number of times interval joining aborted");
 
-const char LiveIntervals::ID = 0;
+char LiveIntervals::ID = 0;
 namespace {
   RegisterPass X("liveintervals", "Live Interval Analysis");
 


Index: llvm/lib/CodeGen/LiveVariables.cpp
diff -u llvm/lib/CodeGen/LiveVariables.cpp:1.81 llvm/lib/CodeGen/LiveVariables.cpp:1.82
--- llvm/lib/CodeGen/LiveVariables.cpp:1.81	Wed May  2 16:39:18 2007
+++ llvm/lib/CodeGen/LiveVariables.cpp	Wed May  2 20:11:53 2007
@@ -37,7 +37,7 @@
 #include 
 using namespace llvm;
 
-const char LiveVariables::ID = 0;
+char LiveVariables::ID = 0;
 static RegisterPass X("livevars", "Live Variable Analysis");
 
 void LiveVariables::VarInfo::dump() const {


Index: llvm/lib/CodeGen/MachOWriter.cpp
diff -u llvm/lib/CodeGen/MachOWriter.cpp:1.34 llvm/lib/CodeGen/MachOWriter.cpp:1.35
--- llvm/lib/CodeGen/MachOWriter.cpp:1.34	Wed May  2 16:39:19 2007
+++ llvm/lib/CodeGen/MachOWriter.cpp	Wed May  2 20:11:53 2007
@@ -317,7 +317,7 @@
 //                          MachOWriter Implementation
 //===----------------------------------------------------------------------===//
 
-const char MachOWriter::ID = 0;
+char MachOWriter::ID = 0;
 MachOWriter::MachOWriter(std::ostream &o, TargetMachine &tm) 
   : MachineFunctionPass((intptr_t)&ID), O(o), TM(tm) {
   is64Bit = TM.getTargetData()->getPointerSizeInBits() == 64;


Index: llvm/lib/CodeGen/MachOWriter.h
diff -u llvm/lib/CodeGen/MachOWriter.h:1.5 llvm/lib/CodeGen/MachOWriter.h:1.6
--- llvm/lib/CodeGen/MachOWriter.h:1.5	Wed May  2 16:39:19 2007
+++ llvm/lib/CodeGen/MachOWriter.h	Wed May  2 20:11:53 2007
@@ -84,7 +84,7 @@
   class MachOWriter : public MachineFunctionPass {
     friend class MachOCodeEmitter;
   public:
-    static const char ID;
+    static char ID;
     MachineCodeEmitter &getMachineCodeEmitter() const {
       return *(MachineCodeEmitter*)MCE;
     }


Index: llvm/lib/CodeGen/MachineFunction.cpp
diff -u llvm/lib/CodeGen/MachineFunction.cpp:1.113 llvm/lib/CodeGen/MachineFunction.cpp:1.114
--- llvm/lib/CodeGen/MachineFunction.cpp:1.113	Wed May  2 16:39:19 2007
+++ llvm/lib/CodeGen/MachineFunction.cpp	Wed May  2 20:11:53 2007
@@ -44,7 +44,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN Printer : public MachineFunctionPass {
-    static const char ID;
+    static char ID;
 
     std::ostream *OS;
     const std::string Banner;
@@ -64,7 +64,7 @@
       return false;
     }
   };
-  const char Printer::ID = 0;
+  char Printer::ID = 0;
 }
 
 /// Returns a newly-created MachineFunction Printer pass. The default output
@@ -77,7 +77,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN Deleter : public MachineFunctionPass {
-    static const char ID;
+    static char ID;
     Deleter() : MachineFunctionPass((intptr_t)&ID) {}
 
     const char *getPassName() const { return "Machine Code Deleter"; }
@@ -88,7 +88,7 @@
       return true;
     }
   };
-  const char Deleter::ID = 0;
+  char Deleter::ID = 0;
 }
 
 /// MachineCodeDeletion Pass - This pass deletes all of the machine code for


Index: llvm/lib/CodeGen/MachineModuleInfo.cpp
diff -u llvm/lib/CodeGen/MachineModuleInfo.cpp:1.8 llvm/lib/CodeGen/MachineModuleInfo.cpp:1.9
--- llvm/lib/CodeGen/MachineModuleInfo.cpp:1.8	Wed May  2 16:39:19 2007
+++ llvm/lib/CodeGen/MachineModuleInfo.cpp	Wed May  2 20:11:53 2007
@@ -30,7 +30,7 @@
 namespace {
   RegisterPass X("machinemoduleinfo", "Module Information");
 }
-const char MachineModuleInfo::ID = 0;
+char MachineModuleInfo::ID = 0;
 
 //===----------------------------------------------------------------------===//
 
@@ -1751,14 +1751,14 @@
 namespace llvm {
 
 struct DebugLabelFolder : public MachineFunctionPass {
-  static const char ID;
+  static char ID;
   DebugLabelFolder() : MachineFunctionPass((intptr_t)&ID) {}
 
   virtual bool runOnMachineFunction(MachineFunction &MF);
   virtual const char *getPassName() const { return "Label Folder"; }
 };
 
-const char DebugLabelFolder::ID = 0;
+char DebugLabelFolder::ID = 0;
 
 bool DebugLabelFolder::runOnMachineFunction(MachineFunction &MF) {
   // Get machine module info.


Index: llvm/lib/CodeGen/PHIElimination.cpp
diff -u llvm/lib/CodeGen/PHIElimination.cpp:1.59 llvm/lib/CodeGen/PHIElimination.cpp:1.60
--- llvm/lib/CodeGen/PHIElimination.cpp:1.59	Wed May  2 16:39:19 2007
+++ llvm/lib/CodeGen/PHIElimination.cpp	Wed May  2 20:11:53 2007
@@ -33,7 +33,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN PNE : public MachineFunctionPass {
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     PNE() : MachineFunctionPass((intptr_t)&ID) {}
 
     bool runOnMachineFunction(MachineFunction &Fn) {
@@ -76,7 +76,7 @@
     VRegPHIUse VRegPHIUseCount;
   };
 
-  const char PNE::ID = 0;
+  char PNE::ID = 0;
   RegisterPass X("phi-node-elimination",
                       "Eliminate PHI nodes for register allocation");
 }


Index: llvm/lib/CodeGen/PrologEpilogInserter.cpp
diff -u llvm/lib/CodeGen/PrologEpilogInserter.cpp:1.86 llvm/lib/CodeGen/PrologEpilogInserter.cpp:1.87
--- llvm/lib/CodeGen/PrologEpilogInserter.cpp:1.86	Wed May  2 16:39:19 2007
+++ llvm/lib/CodeGen/PrologEpilogInserter.cpp	Wed May  2 20:11:53 2007
@@ -32,7 +32,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN PEI : public MachineFunctionPass {
-    static const char ID;
+    static char ID;
     PEI() : MachineFunctionPass((intptr_t)&ID) {}
 
     const char *getPassName() const {
@@ -101,7 +101,7 @@
     void replaceFrameIndices(MachineFunction &Fn);
     void insertPrologEpilogCode(MachineFunction &Fn);
   };
-  const char PEI::ID = 0;
+  char PEI::ID = 0;
 }
 
 


Index: llvm/lib/CodeGen/RegAllocLinearScan.cpp
diff -u llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.147 llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.148
--- llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.147	Wed May  2 16:39:19 2007
+++ llvm/lib/CodeGen/RegAllocLinearScan.cpp	Wed May  2 20:11:53 2007
@@ -48,7 +48,7 @@
   static unsigned numIntervals = 0;
 
   struct VISIBILITY_HIDDEN RA : public MachineFunctionPass {
-    static const char ID;
+    static char ID;
     RA() : MachineFunctionPass((intptr_t)&ID) {}
 
     typedef std::pair IntervalPtr;
@@ -149,7 +149,7 @@
       }
     }
   };
-  const char RA::ID = 0;
+  char RA::ID = 0;
 }
 
 void RA::ComputeRelatedRegClasses() {


Index: llvm/lib/CodeGen/RegAllocLocal.cpp
diff -u llvm/lib/CodeGen/RegAllocLocal.cpp:1.104 llvm/lib/CodeGen/RegAllocLocal.cpp:1.105
--- llvm/lib/CodeGen/RegAllocLocal.cpp:1.104	Wed May  2 16:39:19 2007
+++ llvm/lib/CodeGen/RegAllocLocal.cpp	Wed May  2 20:11:53 2007
@@ -44,7 +44,7 @@
 
   class VISIBILITY_HIDDEN RA : public MachineFunctionPass {
   public:
-    static const char ID;
+    static char ID;
     RA() : MachineFunctionPass((intptr_t)&ID) {}
   private:
     const TargetMachine *TM;
@@ -228,7 +228,7 @@
     void reloadPhysReg(MachineBasicBlock &MBB, MachineBasicBlock::iterator &I,
                        unsigned PhysReg);
   };
-  const char RA::ID = 0;
+  char RA::ID = 0;
 }
 
 /// getStackSpaceFor - This allocates space for the specified virtual register


Index: llvm/lib/CodeGen/RegAllocSimple.cpp
diff -u llvm/lib/CodeGen/RegAllocSimple.cpp:1.85 llvm/lib/CodeGen/RegAllocSimple.cpp:1.86
--- llvm/lib/CodeGen/RegAllocSimple.cpp:1.85	Wed May  2 16:39:19 2007
+++ llvm/lib/CodeGen/RegAllocSimple.cpp	Wed May  2 20:11:53 2007
@@ -39,7 +39,7 @@
 
   class VISIBILITY_HIDDEN RegAllocSimple : public MachineFunctionPass {
   public:
-    static const char ID;
+    static char ID;
     RegAllocSimple() : MachineFunctionPass((intptr_t)&ID) {}
   private:
     MachineFunction *MF;
@@ -94,7 +94,7 @@
     void spillVirtReg(MachineBasicBlock &MBB, MachineBasicBlock::iterator I,
                       unsigned VirtReg, unsigned PhysReg);
   };
-  const char RegAllocSimple::ID = 0;
+  char RegAllocSimple::ID = 0;
 }
 
 /// getStackSpaceFor - This allocates space for the specified virtual


Index: llvm/lib/CodeGen/TwoAddressInstructionPass.cpp
diff -u llvm/lib/CodeGen/TwoAddressInstructionPass.cpp:1.49 llvm/lib/CodeGen/TwoAddressInstructionPass.cpp:1.50
--- llvm/lib/CodeGen/TwoAddressInstructionPass.cpp:1.49	Wed May  2 16:39:19 2007
+++ llvm/lib/CodeGen/TwoAddressInstructionPass.cpp	Wed May  2 20:11:53 2007
@@ -50,7 +50,7 @@
 namespace {
   struct VISIBILITY_HIDDEN TwoAddressInstructionPass
    : public MachineFunctionPass {
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     TwoAddressInstructionPass() : MachineFunctionPass((intptr_t)&ID) {}
 
     virtual void getAnalysisUsage(AnalysisUsage &AU) const;
@@ -59,7 +59,7 @@
     bool runOnMachineFunction(MachineFunction&);
   };
 
-  const char TwoAddressInstructionPass::ID = 0;
+  char TwoAddressInstructionPass::ID = 0;
   RegisterPass
   X("twoaddressinstruction", "Two-Address instruction pass");
 }


Index: llvm/lib/CodeGen/UnreachableBlockElim.cpp
diff -u llvm/lib/CodeGen/UnreachableBlockElim.cpp:1.11 llvm/lib/CodeGen/UnreachableBlockElim.cpp:1.12
--- llvm/lib/CodeGen/UnreachableBlockElim.cpp:1.11	Wed May  2 16:39:19 2007
+++ llvm/lib/CodeGen/UnreachableBlockElim.cpp	Wed May  2 20:11:53 2007
@@ -35,10 +35,10 @@
   class VISIBILITY_HIDDEN UnreachableBlockElim : public FunctionPass {
     virtual bool runOnFunction(Function &F);
   public:
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     UnreachableBlockElim() : FunctionPass((intptr_t)&ID) {}
   };
-  const char UnreachableBlockElim::ID = 0;
+  char UnreachableBlockElim::ID = 0;
   RegisterPass
   X("unreachableblockelim", "Remove unreachable blocks from the CFG");
 }





From dpatel at apple.com  Wed May  2 20:14:11 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 20:14:11 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/PassManagers.h
Message-ID: <200705030114.l431EBRH030341@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

PassManagers.h updated: 1.18 -> 1.19
---
Log message:

Drop 'const'


---
Diffs of the changes:  (+1 -1)

 PassManagers.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/include/llvm/PassManagers.h
diff -u llvm/include/llvm/PassManagers.h:1.18 llvm/include/llvm/PassManagers.h:1.19
--- llvm/include/llvm/PassManagers.h:1.18	Wed May  2 16:39:18 2007
+++ llvm/include/llvm/PassManagers.h	Wed May  2 20:11:53 2007
@@ -336,7 +336,7 @@
 class FPPassManager : public ModulePass, public PMDataManager {
  
 public:
-  static const char ID;
+  static char ID;
   explicit FPPassManager(int Depth) 
   : ModulePass((intptr_t)&ID), PMDataManager(Depth) { }
   





From dpatel at apple.com  Wed May  2 20:14:10 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 20:14:10 -0500
Subject: [llvm-commits] CVS: llvm/lib/Bytecode/Writer/Writer.cpp
Message-ID: <200705030114.l431EAlr030306@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Bytecode/Writer:

Writer.cpp updated: 1.181 -> 1.182
---
Log message:

Drop 'const'


---
Diffs of the changes:  (+1 -1)

 Writer.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/lib/Bytecode/Writer/Writer.cpp
diff -u llvm/lib/Bytecode/Writer/Writer.cpp:1.181 llvm/lib/Bytecode/Writer/Writer.cpp:1.182
--- llvm/lib/Bytecode/Writer/Writer.cpp:1.181	Wed May  2 16:39:18 2007
+++ llvm/lib/Bytecode/Writer/Writer.cpp	Wed May  2 20:11:53 2007
@@ -47,7 +47,7 @@
 /// @brief The bytecode version number
 const unsigned BCVersionNum = 7;
 
-const char WriteBytecodePass::ID = 0;
+char WriteBytecodePass::ID = 0;
 static RegisterPass X("emitbytecode", "Bytecode Writer");
 
 STATISTIC(BytesWritten, "Number of bytecode bytes written");





From dpatel at apple.com  Wed May  2 20:14:11 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 20:14:11 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/ARM/ARMConstantIslandPass.cpp
	ARMLoadStoreOptimizer.cpp
Message-ID: <200705030114.l431EBMc030331@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/ARM:

ARMConstantIslandPass.cpp updated: 1.41 -> 1.42
ARMLoadStoreOptimizer.cpp updated: 1.10 -> 1.11
---
Log message:

Drop 'const'


---
Diffs of the changes:  (+4 -4)

 ARMConstantIslandPass.cpp |    4 ++--
 ARMLoadStoreOptimizer.cpp |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


Index: llvm/lib/Target/ARM/ARMConstantIslandPass.cpp
diff -u llvm/lib/Target/ARM/ARMConstantIslandPass.cpp:1.41 llvm/lib/Target/ARM/ARMConstantIslandPass.cpp:1.42
--- llvm/lib/Target/ARM/ARMConstantIslandPass.cpp:1.41	Wed May  2 16:39:19 2007
+++ llvm/lib/Target/ARM/ARMConstantIslandPass.cpp	Wed May  2 20:11:53 2007
@@ -128,7 +128,7 @@
     ARMFunctionInfo *AFI;
     bool isThumb;
   public:
-    static const char ID;
+    static char ID;
     ARMConstantIslands() : MachineFunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnMachineFunction(MachineFunction &Fn);
@@ -174,7 +174,7 @@
     void dumpBBs();
     void verify(MachineFunction &Fn);
   };
-  const char ARMConstantIslands::ID = 0;
+  char ARMConstantIslands::ID = 0;
 }
 
 /// verify - check BBOffsets, BBSizes, alignment of islands


Index: llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
diff -u llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp:1.10 llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp:1.11
--- llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp:1.10	Wed May  2 16:39:19 2007
+++ llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp	Wed May  2 20:11:53 2007
@@ -38,7 +38,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN ARMLoadStoreOpt : public MachineFunctionPass {
-    static const char ID;
+    static char ID;
     ARMLoadStoreOpt() : MachineFunctionPass((intptr_t)&ID) {}
 
     const TargetInstrInfo *TII;
@@ -73,7 +73,7 @@
     bool LoadStoreMultipleOpti(MachineBasicBlock &MBB);
     bool MergeReturnIntoLDM(MachineBasicBlock &MBB);
   };
-  const char ARMLoadStoreOpt::ID = 0;
+  char ARMLoadStoreOpt::ID = 0;
 }
 
 /// createARMLoadStoreOptimizationPass - returns an instance of the load / store





From dpatel at apple.com  Wed May  2 20:14:11 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 20:14:11 -0500
Subject: [llvm-commits] CVS: llvm/lib/Analysis/IPA/Andersens.cpp
	CallGraph.cpp CallGraphSCCPass.cpp FindUsedTypes.cpp
	GlobalsModRef.cpp
Message-ID: <200705030114.l431EBow030326@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Analysis/IPA:

Andersens.cpp updated: 1.48 -> 1.49
CallGraph.cpp updated: 1.68 -> 1.69
CallGraphSCCPass.cpp updated: 1.23 -> 1.24
FindUsedTypes.cpp updated: 1.40 -> 1.41
GlobalsModRef.cpp updated: 1.31 -> 1.32
---
Log message:

Drop 'const'


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

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


Index: llvm/lib/Analysis/IPA/Andersens.cpp
diff -u llvm/lib/Analysis/IPA/Andersens.cpp:1.48 llvm/lib/Analysis/IPA/Andersens.cpp:1.49
--- llvm/lib/Analysis/IPA/Andersens.cpp:1.48	Wed May  2 16:39:18 2007
+++ llvm/lib/Analysis/IPA/Andersens.cpp	Wed May  2 20:11:53 2007
@@ -76,7 +76,7 @@
   class VISIBILITY_HIDDEN Andersens : public ModulePass, public AliasAnalysis,
                                       private InstVisitor {
   public:
-    static const char ID; // Class identification, replacement for typeinfo
+    static 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 char Andersens::ID = 0;
+  char Andersens::ID = 0;
   RegisterPass X("anders-aa",
                             "Andersen's Interprocedural Alias Analysis");
   RegisterAnalysisGroup Y(X);


Index: llvm/lib/Analysis/IPA/CallGraph.cpp
diff -u llvm/lib/Analysis/IPA/CallGraph.cpp:1.68 llvm/lib/Analysis/IPA/CallGraph.cpp:1.69
--- llvm/lib/Analysis/IPA/CallGraph.cpp:1.68	Wed May  2 16:39:18 2007
+++ llvm/lib/Analysis/IPA/CallGraph.cpp	Wed May  2 20:11:53 2007
@@ -51,7 +51,7 @@
   CallGraphNode *CallsExternalNode;
 
 public:
-  static const char ID; // Class identification, replacement for typeinfo
+  static char ID; // Class identification, replacement for typeinfo
   BasicCallGraph() : ModulePass((intptr_t)&ID), Root(0), 
     ExternalCallingNode(0), CallsExternalNode(0) {}
 
@@ -196,8 +196,8 @@
 
 } //End anonymous namespace
 
-const char CallGraph::ID = 0;
-const char BasicCallGraph::ID = 0;
+char CallGraph::ID = 0;
+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.23 llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp:1.24
--- llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp:1.23	Wed May  2 16:39:18 2007
+++ llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp	Wed May  2 20:11:53 2007
@@ -30,7 +30,7 @@
 class CGPassManager : public ModulePass, public PMDataManager {
 
 public:
-  static const char ID;
+  static char ID;
   CGPassManager(int Depth) 
     : ModulePass((intptr_t)&ID), PMDataManager(Depth) { }
 
@@ -73,7 +73,7 @@
   }
 };
 
-const char CGPassManager::ID = 0;
+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.40 llvm/lib/Analysis/IPA/FindUsedTypes.cpp:1.41
--- llvm/lib/Analysis/IPA/FindUsedTypes.cpp:1.40	Wed May  2 16:39:18 2007
+++ llvm/lib/Analysis/IPA/FindUsedTypes.cpp	Wed May  2 20:11:53 2007
@@ -21,7 +21,7 @@
 #include "llvm/Support/InstIterator.h"
 using namespace llvm;
 
-const char FindUsedTypes::ID = 0;
+char FindUsedTypes::ID = 0;
 static RegisterPass
 X("printusedtypes", "Find Used Types");
 


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





From dpatel at apple.com  Wed May  2 20:14:11 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 20:14:11 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/IA64/IA64Bundling.cpp
Message-ID: <200705030114.l431EBi3030343@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/IA64:

IA64Bundling.cpp updated: 1.10 -> 1.11
---
Log message:

Drop 'const'


---
Diffs of the changes:  (+2 -2)

 IA64Bundling.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm/lib/Target/IA64/IA64Bundling.cpp
diff -u llvm/lib/Target/IA64/IA64Bundling.cpp:1.10 llvm/lib/Target/IA64/IA64Bundling.cpp:1.11
--- llvm/lib/Target/IA64/IA64Bundling.cpp:1.10	Wed May  2 16:39:19 2007
+++ llvm/lib/Target/IA64/IA64Bundling.cpp	Wed May  2 20:11:53 2007
@@ -36,7 +36,7 @@
 
 namespace {
   struct IA64BundlingPass : public MachineFunctionPass {
-    static const char ID;
+    static char ID;
     /// Target machine description which we query for reg. names, data
     /// layout, etc.
     ///
@@ -63,7 +63,7 @@
     // 'fallthrough' code
     std::set PendingRegWrites;
   };
-  const char IA64BundlingPass::ID = 0;
+  char IA64BundlingPass::ID = 0;
 } // end of anonymous namespace
 
 /// createIA64BundlingPass - Returns a pass that adds STOP (;;) instructions





From dpatel at apple.com  Wed May  2 20:14:10 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 20:14:10 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/CodeGen/AsmPrinter.h
	LiveIntervalAnalysis.h LiveVariables.h MachineModuleInfo.h
	SelectionDAGISel.h
Message-ID: <200705030114.l431EAoG030301@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/CodeGen:

AsmPrinter.h updated: 1.65 -> 1.66
LiveIntervalAnalysis.h updated: 1.82 -> 1.83
LiveVariables.h updated: 1.43 -> 1.44
MachineModuleInfo.h updated: 1.9 -> 1.10
SelectionDAGISel.h updated: 1.39 -> 1.40
---
Log message:

Drop 'const'


---
Diffs of the changes:  (+5 -5)

 AsmPrinter.h           |    2 +-
 LiveIntervalAnalysis.h |    2 +-
 LiveVariables.h        |    2 +-
 MachineModuleInfo.h    |    2 +-
 SelectionDAGISel.h     |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)


Index: llvm/include/llvm/CodeGen/AsmPrinter.h
diff -u llvm/include/llvm/CodeGen/AsmPrinter.h:1.65 llvm/include/llvm/CodeGen/AsmPrinter.h:1.66
--- llvm/include/llvm/CodeGen/AsmPrinter.h:1.65	Wed May  2 16:39:18 2007
+++ llvm/include/llvm/CodeGen/AsmPrinter.h	Wed May  2 20:11:53 2007
@@ -34,7 +34,7 @@
   /// AsmPrinter - This class is intended to be used as a driving class for all
   /// asm writers.
   class AsmPrinter : public MachineFunctionPass {
-    static const char ID;
+    static char ID;
 
     /// FunctionNumber - This provides a unique ID for each function emitted in
     /// this translation unit.  It is autoincremented by SetupMachineFunction,


Index: llvm/include/llvm/CodeGen/LiveIntervalAnalysis.h
diff -u llvm/include/llvm/CodeGen/LiveIntervalAnalysis.h:1.82 llvm/include/llvm/CodeGen/LiveIntervalAnalysis.h:1.83
--- llvm/include/llvm/CodeGen/LiveIntervalAnalysis.h:1.82	Wed May  2 16:39:18 2007
+++ llvm/include/llvm/CodeGen/LiveIntervalAnalysis.h	Wed May  2 20:11:53 2007
@@ -65,7 +65,7 @@
     BitVector JoinedLIs;
 
   public:
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     LiveIntervals() : MachineFunctionPass((intptr_t)&ID) {}
 
     struct CopyRec {


Index: llvm/include/llvm/CodeGen/LiveVariables.h
diff -u llvm/include/llvm/CodeGen/LiveVariables.h:1.43 llvm/include/llvm/CodeGen/LiveVariables.h:1.44
--- llvm/include/llvm/CodeGen/LiveVariables.h:1.43	Wed May  2 16:39:18 2007
+++ llvm/include/llvm/CodeGen/LiveVariables.h	Wed May  2 20:11:53 2007
@@ -40,7 +40,7 @@
 
 class LiveVariables : public MachineFunctionPass {
 public:
-  static const char ID; // Pass identifcation, replacement for typeid
+  static char ID; // Pass identifcation, replacement for typeid
   LiveVariables() : MachineFunctionPass((intptr_t)&ID) {}
 
   /// VarInfo - This represents the regions where a virtual register is live in


Index: llvm/include/llvm/CodeGen/MachineModuleInfo.h
diff -u llvm/include/llvm/CodeGen/MachineModuleInfo.h:1.9 llvm/include/llvm/CodeGen/MachineModuleInfo.h:1.10
--- llvm/include/llvm/CodeGen/MachineModuleInfo.h:1.9	Wed May  2 16:39:18 2007
+++ llvm/include/llvm/CodeGen/MachineModuleInfo.h	Wed May  2 20:11:53 2007
@@ -1022,7 +1022,7 @@
   std::vector TypeInfos;
 
 public:
-  static const char ID; // Pass identifcation, replacement for typeid
+  static char ID; // Pass identifcation, replacement for typeid
 
   MachineModuleInfo();
   ~MachineModuleInfo();


Index: llvm/include/llvm/CodeGen/SelectionDAGISel.h
diff -u llvm/include/llvm/CodeGen/SelectionDAGISel.h:1.39 llvm/include/llvm/CodeGen/SelectionDAGISel.h:1.40
--- llvm/include/llvm/CodeGen/SelectionDAGISel.h:1.39	Wed May  2 16:39:18 2007
+++ llvm/include/llvm/CodeGen/SelectionDAGISel.h	Wed May  2 20:11:53 2007
@@ -41,7 +41,7 @@
   MachineBasicBlock *BB;
   std::vector TopOrder;
   unsigned DAGSize;
-  static const char ID;
+  static char ID;
 
   explicit SelectionDAGISel(TargetLowering &tli) : 
     FunctionPass((intptr_t)&ID), TLI(tli), DAGSize(0) {}





From dpatel at apple.com  Wed May  2 20:14:09 2007
From: dpatel at apple.com (Devang Patel)
Date: Wed, 2 May 2007 20:14:09 -0500
Subject: [llvm-commits] CVS: llvm/lib/Analysis/AliasAnalysis.cpp
	AliasAnalysisCounter.cpp AliasAnalysisEvaluator.cpp
	AliasDebugger.cpp AliasSetTracker.cpp BasicAliasAnalysis.cpp
	CFGPrinter.cpp InstCount.cpp IntervalPartition.cpp
	LoadValueNumbering.cpp LoopInfo.cpp LoopPass.cpp
	PostDominators.cpp ProfileInfo.cpp ProfileInfoLoaderPass.cpp
	ScalarEvolution.cpp ValueNumbering.cpp
Message-ID: <200705030114.l431E9Wk030196@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Analysis:

AliasAnalysis.cpp updated: 1.33 -> 1.34
AliasAnalysisCounter.cpp updated: 1.22 -> 1.23
AliasAnalysisEvaluator.cpp updated: 1.35 -> 1.36
AliasDebugger.cpp updated: 1.5 -> 1.6
AliasSetTracker.cpp updated: 1.48 -> 1.49
BasicAliasAnalysis.cpp updated: 1.110 -> 1.111
CFGPrinter.cpp updated: 1.24 -> 1.25
InstCount.cpp updated: 1.22 -> 1.23
IntervalPartition.cpp updated: 1.34 -> 1.35
LoadValueNumbering.cpp updated: 1.41 -> 1.42
LoopInfo.cpp updated: 1.85 -> 1.86
LoopPass.cpp updated: 1.20 -> 1.21
PostDominators.cpp updated: 1.69 -> 1.70
ProfileInfo.cpp updated: 1.14 -> 1.15
ProfileInfoLoaderPass.cpp updated: 1.20 -> 1.21
ScalarEvolution.cpp updated: 1.115 -> 1.116
ValueNumbering.cpp updated: 1.27 -> 1.28
---
Log message:

Drop 'const'


---
Diffs of the changes:  (+36 -36)

 AliasAnalysis.cpp          |    2 +-
 AliasAnalysisCounter.cpp   |    4 ++--
 AliasAnalysisEvaluator.cpp |    4 ++--
 AliasDebugger.cpp          |    4 ++--
 AliasSetTracker.cpp        |    4 ++--
 BasicAliasAnalysis.cpp     |    8 ++++----
 CFGPrinter.cpp             |    8 ++++----
 InstCount.cpp              |    4 ++--
 IntervalPartition.cpp      |    2 +-
 LoadValueNumbering.cpp     |    4 ++--
 LoopInfo.cpp               |    2 +-
 LoopPass.cpp               |    2 +-
 PostDominators.cpp         |    6 +++---
 ProfileInfo.cpp            |    6 +++---
 ProfileInfoLoaderPass.cpp  |    4 ++--
 ScalarEvolution.cpp        |    2 +-
 ValueNumbering.cpp         |    6 +++---
 17 files changed, 36 insertions(+), 36 deletions(-)


Index: llvm/lib/Analysis/AliasAnalysis.cpp
diff -u llvm/lib/Analysis/AliasAnalysis.cpp:1.33 llvm/lib/Analysis/AliasAnalysis.cpp:1.34
--- llvm/lib/Analysis/AliasAnalysis.cpp:1.33	Wed May  2 16:39:18 2007
+++ llvm/lib/Analysis/AliasAnalysis.cpp	Wed May  2 20:11:53 2007
@@ -36,7 +36,7 @@
 namespace {
   RegisterAnalysisGroup Z("Alias Analysis");
 }
-const char AliasAnalysis::ID = 0;
+char AliasAnalysis::ID = 0;
 
 //===----------------------------------------------------------------------===//
 // Default chaining methods


Index: llvm/lib/Analysis/AliasAnalysisCounter.cpp
diff -u llvm/lib/Analysis/AliasAnalysisCounter.cpp:1.22 llvm/lib/Analysis/AliasAnalysisCounter.cpp:1.23
--- llvm/lib/Analysis/AliasAnalysisCounter.cpp:1.22	Wed May  2 16:39:18 2007
+++ llvm/lib/Analysis/AliasAnalysisCounter.cpp	Wed May  2 20:11:53 2007
@@ -34,7 +34,7 @@
     const char *Name;
     Module *M;
   public:
-    static const char ID; // Class identification, replacement for typeinfo
+    static char ID; // Class identification, replacement for typeinfo
     AliasAnalysisCounter() : ModulePass((intptr_t) &ID) {
       No = May = Must = 0;
       NoMR = JustRef = JustMod = MR = 0;
@@ -108,7 +108,7 @@
     }
   };
 
-  const char AliasAnalysisCounter::ID = 0;
+  char AliasAnalysisCounter::ID = 0;
   RegisterPass
   X("count-aa", "Count Alias Analysis Query Responses");
   RegisterAnalysisGroup Y(X);


Index: llvm/lib/Analysis/AliasAnalysisEvaluator.cpp
diff -u llvm/lib/Analysis/AliasAnalysisEvaluator.cpp:1.35 llvm/lib/Analysis/AliasAnalysisEvaluator.cpp:1.36
--- llvm/lib/Analysis/AliasAnalysisEvaluator.cpp:1.35	Wed May  2 16:39:18 2007
+++ llvm/lib/Analysis/AliasAnalysisEvaluator.cpp	Wed May  2 20:11:53 2007
@@ -50,7 +50,7 @@
     unsigned NoModRef, Mod, Ref, ModRef;
 
   public:
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     AAEval() : FunctionPass((intptr_t)&ID) {}
 
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
@@ -73,7 +73,7 @@
     bool doFinalization(Module &M);
   };
 
-  const char AAEval::ID = 0;
+  char AAEval::ID = 0;
   RegisterPass
   X("aa-eval", "Exhaustive Alias Analysis Precision Evaluator");
 }


Index: llvm/lib/Analysis/AliasDebugger.cpp
diff -u llvm/lib/Analysis/AliasDebugger.cpp:1.5 llvm/lib/Analysis/AliasDebugger.cpp:1.6
--- llvm/lib/Analysis/AliasDebugger.cpp:1.5	Wed May  2 16:39:18 2007
+++ llvm/lib/Analysis/AliasDebugger.cpp	Wed May  2 20:11:53 2007
@@ -40,7 +40,7 @@
     std::set Vals;
     
   public:
-    static const char ID; // Class identification, replacement for typeinfo
+    static char ID; // Class identification, replacement for typeinfo
     AliasDebugger() : ModulePass((intptr_t)&ID) {}
 
     bool runOnModule(Module &M) {
@@ -122,7 +122,7 @@
 
   };
 
-  const char AliasDebugger::ID = 0;
+  char AliasDebugger::ID = 0;
   RegisterPass X("debug-aa", "AA use debugger");
   RegisterAnalysisGroup Y(X);
 }


Index: llvm/lib/Analysis/AliasSetTracker.cpp
diff -u llvm/lib/Analysis/AliasSetTracker.cpp:1.48 llvm/lib/Analysis/AliasSetTracker.cpp:1.49
--- llvm/lib/Analysis/AliasSetTracker.cpp:1.48	Wed May  2 16:39:18 2007
+++ llvm/lib/Analysis/AliasSetTracker.cpp	Wed May  2 20:11:53 2007
@@ -555,7 +555,7 @@
   class VISIBILITY_HIDDEN AliasSetPrinter : public FunctionPass {
     AliasSetTracker *Tracker;
   public:
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     AliasSetPrinter() : FunctionPass((intptr_t)&ID) {}
 
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
@@ -573,6 +573,6 @@
       return false;
     }
   };
-  const char AliasSetPrinter::ID = 0;
+  char AliasSetPrinter::ID = 0;
   RegisterPass X("print-alias-sets", "Alias Set Printer");
 }


Index: llvm/lib/Analysis/BasicAliasAnalysis.cpp
diff -u llvm/lib/Analysis/BasicAliasAnalysis.cpp:1.110 llvm/lib/Analysis/BasicAliasAnalysis.cpp:1.111
--- llvm/lib/Analysis/BasicAliasAnalysis.cpp:1.110	Wed May  2 16:39:18 2007
+++ llvm/lib/Analysis/BasicAliasAnalysis.cpp	Wed May  2 20:11:53 2007
@@ -36,7 +36,7 @@
   /// such it doesn't follow many of the rules that other alias analyses must.
   ///
   struct VISIBILITY_HIDDEN NoAA : public ImmutablePass, public AliasAnalysis {
-    static const char ID; // Class identification, replacement for typeinfo
+    static char ID; // Class identification, replacement for typeinfo
     NoAA() : ImmutablePass((intptr_t)&ID) {}
 
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
@@ -77,7 +77,7 @@
   };
 
   // Register this pass...
-  const char NoAA::ID = 0;
+  char NoAA::ID = 0;
   RegisterPass
   U("no-aa", "No Alias Analysis (always returns 'may' alias)");
 
@@ -92,7 +92,7 @@
   /// Because it doesn't chain to a previous alias analysis (like -no-aa), it
   /// derives from the NoAA class.
   struct VISIBILITY_HIDDEN BasicAliasAnalysis : public NoAA {
-    static const char ID; // Class identification, replacement for typeinfo
+    static char ID; // Class identification, replacement for typeinfo
     AliasResult alias(const Value *V1, unsigned V1Size,
                       const Value *V2, unsigned V2Size);
 
@@ -124,7 +124,7 @@
   };
 
   // Register this pass...
-  const char BasicAliasAnalysis::ID = 0;
+  char BasicAliasAnalysis::ID = 0;
   RegisterPass
   X("basicaa", "Basic Alias Analysis (default AA impl)");
 


Index: llvm/lib/Analysis/CFGPrinter.cpp
diff -u llvm/lib/Analysis/CFGPrinter.cpp:1.24 llvm/lib/Analysis/CFGPrinter.cpp:1.25
--- llvm/lib/Analysis/CFGPrinter.cpp:1.24	Wed May  2 16:39:18 2007
+++ llvm/lib/Analysis/CFGPrinter.cpp	Wed May  2 20:11:53 2007
@@ -91,7 +91,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN CFGPrinter : public FunctionPass {
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     CFGPrinter() : FunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnFunction(Function &F) {
@@ -114,12 +114,12 @@
     }
   };
 
-  const char CFGPrinter::ID = 0;
+  char CFGPrinter::ID = 0;
   RegisterPass P1("print-cfg",
                               "Print CFG of function to 'dot' file");
 
   struct VISIBILITY_HIDDEN CFGOnlyPrinter : public CFGPrinter {
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     virtual bool runOnFunction(Function &F) {
       bool OldCFGOnly = CFGOnly;
       CFGOnly = true;
@@ -134,7 +134,7 @@
     }
   };
 
-  const char CFGOnlyPrinter::ID = 0;
+  char CFGOnlyPrinter::ID = 0;
   RegisterPass
   P2("print-cfg-only",
      "Print CFG of function to 'dot' file (with no function bodies)");


Index: llvm/lib/Analysis/InstCount.cpp
diff -u llvm/lib/Analysis/InstCount.cpp:1.22 llvm/lib/Analysis/InstCount.cpp:1.23
--- llvm/lib/Analysis/InstCount.cpp:1.22	Wed May  2 16:39:18 2007
+++ llvm/lib/Analysis/InstCount.cpp	Wed May  2 20:11:53 2007
@@ -51,7 +51,7 @@
       abort();
     }
   public:
-    static const char ID; // Pass identifcation, replacement for typeid
+    static char ID; // Pass identifcation, replacement for typeid
     InstCount() : FunctionPass((intptr_t)&ID) {}
 
     virtual bool runOnFunction(Function &F);
@@ -63,7 +63,7 @@
 
   };
 
-  const char InstCount::ID = 0;
+  char InstCount::ID = 0;
   RegisterPass X("instcount",
                             "Counts the various types of Instructions");
 }


Index: llvm/lib/Analysis/IntervalPartition.cpp
diff -u llvm/lib/Analysis/IntervalPartition.cpp:1.34 llvm/lib/Analysis/IntervalPartition.cpp:1.35
--- llvm/lib/Analysis/IntervalPartition.cpp:1.34	Wed May  2 16:39:18 2007
+++ llvm/lib/Analysis/IntervalPartition.cpp	Wed May  2 20:11:53 2007
@@ -15,7 +15,7 @@
 #include "llvm/Analysis/IntervalIterator.h"
 using namespace llvm;
 
-const char IntervalPartition::ID = 0;
+char IntervalPartition::ID = 0;
 static RegisterPass
 X("intervals", "Interval Partition Construction", true);
 


Index: llvm/lib/Analysis/LoadValueNumbering.cpp
diff -u llvm/lib/Analysis/LoadValueNumbering.cpp:1.41 llvm/lib/Analysis/LoadValueNumbering.cpp:1.42
--- llvm/lib/Analysis/LoadValueNumbering.cpp:1.41	Wed May  2 16:39:18 2007
+++ llvm/lib/Analysis/LoadValueNumbering.cpp	Wed May  2 20:11:53 2007
@@ -40,7 +40,7 @@
 namespace {
   // FIXME: This should not be a FunctionPass.
   struct VISIBILITY_HIDDEN LoadVN : public FunctionPass, public ValueNumbering {
-    static const char ID; // Class identification, replacement for typeinfo
+    static char ID; // Class identification, replacement for typeinfo
     LoadVN() : FunctionPass((intptr_t)&ID) {}
 
     /// Pass Implementation stuff.  This doesn't do any analysis.
@@ -83,7 +83,7 @@
                                  std::vector &RetVals) const;
   };
 
-  const char LoadVN::ID = 0;
+  char LoadVN::ID = 0;
   // Register this pass...
   RegisterPass X("load-vn", "Load Value Numbering");
 


Index: llvm/lib/Analysis/LoopInfo.cpp
diff -u llvm/lib/Analysis/LoopInfo.cpp:1.85 llvm/lib/Analysis/LoopInfo.cpp:1.86
--- llvm/lib/Analysis/LoopInfo.cpp:1.85	Wed May  2 16:39:18 2007
+++ llvm/lib/Analysis/LoopInfo.cpp	Wed May  2 20:11:53 2007
@@ -27,7 +27,7 @@
 #include 
 using namespace llvm;
 
-const char LoopInfo::ID = 0;
+char LoopInfo::ID = 0;
 static RegisterPass
 X("loops", "Natural Loop Construction", true);
 


Index: llvm/lib/Analysis/LoopPass.cpp
diff -u llvm/lib/Analysis/LoopPass.cpp:1.20 llvm/lib/Analysis/LoopPass.cpp:1.21
--- llvm/lib/Analysis/LoopPass.cpp:1.20	Wed May  2 16:39:18 2007
+++ llvm/lib/Analysis/LoopPass.cpp	Wed May  2 20:11:53 2007
@@ -21,7 +21,7 @@
 // LPPassManager
 //
 
-const char LPPassManager::ID = 0;
+char LPPassManager::ID = 0;
 /// LPPassManager manages FPPassManagers and CalLGraphSCCPasses.
 
 LPPassManager::LPPassManager(int Depth) 


Index: llvm/lib/Analysis/PostDominators.cpp
diff -u llvm/lib/Analysis/PostDominators.cpp:1.69 llvm/lib/Analysis/PostDominators.cpp:1.70
--- llvm/lib/Analysis/PostDominators.cpp:1.69	Wed May  2 16:39:18 2007
+++ llvm/lib/Analysis/PostDominators.cpp	Wed May  2 20:11:53 2007
@@ -22,9 +22,9 @@
 //  PostDominatorTree Implementation
 //===----------------------------------------------------------------------===//
 
-const char PostDominatorTree::ID = 0;
-const char PostDominanceFrontier::ID = 0;
-const char PostETForest::ID = 0;
+char PostDominatorTree::ID = 0;
+char PostDominanceFrontier::ID = 0;
+char PostETForest::ID = 0;
 static RegisterPass
 F("postdomtree", "Post-Dominator Tree Construction", true);
 


Index: llvm/lib/Analysis/ProfileInfo.cpp
diff -u llvm/lib/Analysis/ProfileInfo.cpp:1.14 llvm/lib/Analysis/ProfileInfo.cpp:1.15
--- llvm/lib/Analysis/ProfileInfo.cpp:1.14	Wed May  2 16:39:18 2007
+++ llvm/lib/Analysis/ProfileInfo.cpp	Wed May  2 20:11:53 2007
@@ -24,7 +24,7 @@
 namespace {
   RegisterAnalysisGroup Z("Profile Information");
 }
-const char ProfileInfo::ID = 0;
+char ProfileInfo::ID = 0;
 
 ProfileInfo::~ProfileInfo() {}
 
@@ -86,11 +86,11 @@
 namespace {
   struct VISIBILITY_HIDDEN NoProfileInfo 
     : public ImmutablePass, public ProfileInfo {
-    static const char ID; // Class identification, replacement for typeinfo
+    static char ID; // Class identification, replacement for typeinfo
     NoProfileInfo() : ImmutablePass((intptr_t)&ID) {}
   };
 
-  const char NoProfileInfo::ID = 0;
+  char NoProfileInfo::ID = 0;
   // Register this pass...
   RegisterPass
   X("no-profile", "No Profile Information");


Index: llvm/lib/Analysis/ProfileInfoLoaderPass.cpp
diff -u llvm/lib/Analysis/ProfileInfoLoaderPass.cpp:1.20 llvm/lib/Analysis/ProfileInfoLoaderPass.cpp:1.21
--- llvm/lib/Analysis/ProfileInfoLoaderPass.cpp:1.20	Wed May  2 16:39:18 2007
+++ llvm/lib/Analysis/ProfileInfoLoaderPass.cpp	Wed May  2 20:11:53 2007
@@ -32,7 +32,7 @@
   class VISIBILITY_HIDDEN LoaderPass : public ModulePass, public ProfileInfo {
     std::string Filename;
   public:
-    static const char ID; // Class identification, replacement for typeinfo
+    static char ID; // Class identification, replacement for typeinfo
     LoaderPass(const std::string &filename = "")
       : ModulePass((intptr_t)&ID), Filename(filename) {
       if (filename.empty()) Filename = ProfileInfoFilename;
@@ -50,7 +50,7 @@
     virtual bool runOnModule(Module &M);
   };
 
-  const char LoaderPass::ID = 0;
+  char LoaderPass::ID = 0;
   RegisterPass
   X("profile-loader", "Load profile information from llvmprof.out");
 


Index: llvm/lib/Analysis/ScalarEvolution.cpp
diff -u llvm/lib/Analysis/ScalarEvolution.cpp:1.115 llvm/lib/Analysis/ScalarEvolution.cpp:1.116
--- llvm/lib/Analysis/ScalarEvolution.cpp:1.115	Wed May  2 16:39:18 2007
+++ llvm/lib/Analysis/ScalarEvolution.cpp	Wed May  2 20:11:53 2007
@@ -105,7 +105,7 @@
   RegisterPass
   R("scalar-evolution", "Scalar Evolution Analysis");
 }
-const char ScalarEvolution::ID = 0;
+char ScalarEvolution::ID = 0;
 
 //===----------------------------------------------------------------------===//
 //                           SCEV class definitions


Index: llvm/lib/Analysis/ValueNumbering.cpp
diff -u llvm/lib/Analysis/ValueNumbering.cpp:1.27 llvm/lib/Analysis/ValueNumbering.cpp:1.28
--- llvm/lib/Analysis/ValueNumbering.cpp:1.27	Wed May  2 16:39:18 2007
+++ llvm/lib/Analysis/ValueNumbering.cpp	Wed May  2 20:11:53 2007
@@ -22,7 +22,7 @@
 #include "llvm/Support/Compiler.h"
 using namespace llvm;
 
-const char ValueNumbering::ID = 0;
+char ValueNumbering::ID = 0;
 // Register the ValueNumbering interface, providing a nice name to refer to.
 static RegisterAnalysisGroup X("Value Numbering");
 
@@ -52,7 +52,7 @@
   ///
   struct VISIBILITY_HIDDEN BasicVN 
       : public ImmutablePass, public ValueNumbering {
-    static const char ID; // Class identification, replacement for typeinfo
+    static char ID; // Class identification, replacement for typeinfo
     BasicVN() : ImmutablePass((intptr_t)&ID) {}
 
     /// getEqualNumberNodes - Return nodes with the same value number as the
@@ -65,7 +65,7 @@
                                      std::vector &RetVals) const;
   };
 
-  const char BasicVN::ID = 0;
+  char BasicVN::ID = 0;
   // Register this pass...
   RegisterPass
   X("basicvn", "Basic Value Numbering (default GVN impl)");





From evan.cheng at apple.com  Wed May  2 21:00:36 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Wed, 2 May 2007 21:00:36 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/ARM/ARMISelLowering.cpp
Message-ID: <200705030200.l4320aqm031056@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/ARM:

ARMISelLowering.cpp updated: 1.47 -> 1.48
---
Log message:

Typo. It's checking if V is multiple of 4, not multiple of 3. :-)

---
Diffs of the changes:  (+1 -1)

 ARMISelLowering.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/lib/Target/ARM/ARMISelLowering.cpp
diff -u llvm/lib/Target/ARM/ARMISelLowering.cpp:1.47 llvm/lib/Target/ARM/ARMISelLowering.cpp:1.48
--- llvm/lib/Target/ARM/ARMISelLowering.cpp:1.47	Fri Apr 27 08:54:47 2007
+++ llvm/lib/Target/ARM/ARMISelLowering.cpp	Wed May  2 21:00:18 2007
@@ -1486,7 +1486,7 @@
   case MVT::f64:
     if (!Subtarget->hasVFP2())
       return false;
-    if ((V % 3) != 0)
+    if ((V & 3) != 0)
       return false;
     V >>= 2;
     return V == V & ((1LL << 8) - 1);





From fbrandne at mail.tuwien.ac.at  Wed May  2 04:38:10 2007
From: fbrandne at mail.tuwien.ac.at (Florian Brandner)
Date: Wed, 02 May 2007 11:38:10 +0200
Subject: [llvm-commits] minor bugs in STLExtras.h and GraphWriter.cpp
Message-ID: <46385C02.5060509@mail.tuwien.ac.at>

This is a patch to fix a compile error in STLExtras.h, and
a bug in GraphWriter.cpp.

cheers,
florian

ps: i'm not subscribed to the commits list, so please cc me in replies.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: minor_bugs.patch
Type: text/x-patch
Size: 1607 bytes
Desc: not available
Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20070502/c80e65f9/attachment.bin 

From raulherbster at gmail.com  Wed May  2 06:53:44 2007
From: raulherbster at gmail.com (Raul Fernandes Herbster)
Date: Wed, 2 May 2007 08:53:44 -0300
Subject: [llvm-commits] Patch for ARM/ELF debugger
Message-ID: <6fbb4ff20705020453m749bca40o2a0f93cebe3d7196@mail.gmail.com>

This patch provides ARM/ELF application debugging (DWARF format) for ARM
backend.

-- 
Raul Fernandes Herbster
Embedded and Pervasive Computing Laboratory - embedded.dee.ufcg.edu.br
Electrical Engineering Department - DEE - www.ee.ufcg.edu.br
Electrical Engineering and Informatics Center - CEEI
Federal University of Campina Grande - UFCG - www.ufcg.edu.br
Caixa Postal 10105
58109-970 Campina Grande - PB - Brasil
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20070502/07d2afd0/attachment.html 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: arm_debugger.patch
Type: text/x-patch
Size: 5358 bytes
Desc: not available
Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20070502/07d2afd0/attachment.bin 

From sabre at nondot.org  Wed May  2 21:57:31 2007
From: sabre at nondot.org (Chris Lattner)
Date: Wed, 2 May 2007 21:57:31 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/CBackend/CBackend.cpp
Message-ID: <200705030257.l432vVKZ031983@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/CBackend:

CBackend.cpp updated: 1.342 -> 1.343
---
Log message:

revert reid's patch to fix these failures:
test/CodeGen/CBackend/2007-01-08-ParamAttr-ICmp.ll for PR1099: http://llvm.org/PR1099  [DEJAGNU]
Applications/SPASS/SPASS [CBE] 
Regression/C/2004-03-15-IndirectGoto [CBE] 



---
Diffs of the changes:  (+28 -100)

 CBackend.cpp |  128 ++++++++++++-----------------------------------------------
 1 files changed, 28 insertions(+), 100 deletions(-)


Index: llvm/lib/Target/CBackend/CBackend.cpp
diff -u llvm/lib/Target/CBackend/CBackend.cpp:1.342 llvm/lib/Target/CBackend/CBackend.cpp:1.343
--- llvm/lib/Target/CBackend/CBackend.cpp:1.342	Wed May  2 20:11:53 2007
+++ llvm/lib/Target/CBackend/CBackend.cpp	Wed May  2 21:57:13 2007
@@ -412,29 +412,6 @@
   }
 }
 
-#define IMPL_SIGN_EXTENSION(OpTy, Func) { \
-      const IntegerType* IntTy = cast(OpTy); \
-      unsigned BitWidth = IntTy->getBitWidth(); \
-      if (BitWidth != 8 && BitWidth != 16 && BitWidth != 32 && \
-          BitWidth != 64 && BitWidth != 128) { \
-        const char * Suffix; \
-        if (BitWidth <=32)\
-          Suffix = "U"; \
-        else \
-          Suffix = "ULL"; \
-        Out << "("; \
-        Func; \
-        Out << " & (1" << Suffix << " << " << BitWidth - 1 << " ) ? "; \
-        Func; \
-        Out << " | " << (~IntTy->getBitMask()) << Suffix << " : "; \
-        Func; \
-        Out << " & " << IntTy->getBitMask() << Suffix; \
-        Out << ")";\
-       } \
-      else \
-        Func; \
-      }
-
 // Pass the Type* and the variable name and this prints out the variable
 // declaration.
 //
@@ -734,39 +711,23 @@
     case Instruction::BitCast:
       Out << "(";
       printCast(CE->getOpcode(), CE->getOperand(0)->getType(), CE->getType());
-       if (CE->getOpcode() == Instruction::Trunc ||
-           CE->getOpcode() == Instruction::FPToUI ||
-           CE->getOpcode() == Instruction::FPToSI ||
-           CE->getOpcode() == Instruction::PtrToInt) {
-        if (const IntegerType* IntTy = dyn_cast(CE->getType())) {
-          uint64_t BitMask = IntTy->getBitMask();
-          printConstant(CE->getOperand(0));
-          Out << "&" << BitMask << (IntTy->getBitWidth() <=32 ? "U": "ULL");
-        }
-      }
-      else if (CE->getOpcode() == Instruction::SExt &&
-               CE->getOperand(0)->getType() == Type::Int1Ty) {
+      if (CE->getOpcode() == Instruction::SExt &&
+          CE->getOperand(0)->getType() == Type::Int1Ty) {
         // Make sure we really sext from bool here by subtracting from 0
         Out << "0-";
-        printConstant(CE->getOperand(0));
       }
-      else if (CE->getOpcode() == Instruction::SExt &&
-               CE->getOperand(0)->getType()->getTypeID() == Type::IntegerTyID) {
-         IMPL_SIGN_EXTENSION(CE->getOperand(0)->getType(),
-                             printConstant(CE->getOperand(0)));
-       }
-       else if (CE->getOpcode() == Instruction::ZExt &&
-                CE->getOperand(0)->getType()->getTypeID() == Type::IntegerTyID){
-         const IntegerType* IntTy = 
-           cast(CE->getOperand(0)->getType());
-         uint64_t BitMask = IntTy->getBitMask();
-         writeOperand(CE->getOperand(0));
-         Out << "&" << BitMask << (IntTy->getBitWidth() <=32 ? "U": "ULL");
-       }
-       else
-         printConstant(CE->getOperand(0));
-      Out << ")";
+      printConstant(CE->getOperand(0));
+      if (CE->getType() == Type::Int1Ty &&
+          (CE->getOpcode() == Instruction::Trunc ||
+           CE->getOpcode() == Instruction::FPToUI ||
+           CE->getOpcode() == Instruction::FPToSI ||
+           CE->getOpcode() == Instruction::PtrToInt)) {
+        // Make sure we really truncate to bool here by anding with 1
+        Out << "&1u";
+      }
+      Out << ')';
       return;
+
     case Instruction::GetElementPtr:
       Out << "(&(";
       printIndexingExpression(CE->getOperand(0), gep_type_begin(CPV),
@@ -1267,11 +1228,7 @@
     Out << "((";
     printSimpleType(Out, OpTy, castIsSigned);
     Out << ")";
-    if (castIsSigned && OpTy->getTypeID() == Type::IntegerTyID) {
-      IMPL_SIGN_EXTENSION(OpTy, writeOperand(Operand));
-    }
-    else
-      writeOperand(Operand);
+    writeOperand(Operand);
     Out << ")";
   } else 
     writeOperand(Operand);
@@ -1296,9 +1253,7 @@
   switch (predicate) {
     default:
       // for eq and ne, it doesn't matter
-      break;
-    case ICmpInst::ICMP_EQ:
-    case ICmpInst::ICMP_NE:
+      break; 
     case ICmpInst::ICMP_UGT:
     case ICmpInst::ICMP_UGE:
     case ICmpInst::ICMP_ULT:
@@ -1323,25 +1278,10 @@
     else
       printType(Out, OpTy); // not integer, sign doesn't matter
     Out << ")";
-    if(castIsSigned && OpTy->getTypeID() == Type::IntegerTyID) {
-      IMPL_SIGN_EXTENSION(OpTy, writeOperand(Operand));
-    } else {
-      writeOperand(Operand);
-      if(OpTy->getTypeID() == Type::IntegerTyID){
-        const IntegerType * IntTy = cast(OpTy);
-        uint64_t BitMask = IntTy->getBitMask();
-        Out << "&" << BitMask << (IntTy->getBitWidth() <=32 ? "U": "ULL");
-      }
-    }
+    writeOperand(Operand);
     Out << ")";
-  } else {
+  } else 
     writeOperand(Operand);
-    if(OpTy->getTypeID() == Type::IntegerTyID){
-      const IntegerType * IntTy = cast(OpTy);
-      uint64_t BitMask = IntTy->getBitMask();
-      Out << "&" << BitMask << (IntTy->getBitWidth() <=32 ? "U": "ULL");
-    }
-  }
 }
 
 // generateCompilerSpecificCode - This is where we add conditional compilation
@@ -2406,33 +2346,21 @@
         << getFloatBitCastField(I.getType());
   } else {
     printCast(I.getOpcode(), SrcTy, DstTy);
-    if (I.getOpcode() == Instruction::Trunc ||
-        I.getOpcode() == Instruction::FPToUI ||
-        I.getOpcode() == Instruction::FPToSI ||
-        I.getOpcode() == Instruction::PtrToInt) {
-      if (const IntegerType* IntTy = dyn_cast(DstTy)){
-        uint64_t BitMask = IntTy->getBitMask();
-        writeOperand(I.getOperand(0));
-        Out << "&" << BitMask << (IntTy->getBitWidth() <=32 ? "U": "ULL");
-      }
-    } else if (I.getOpcode() == Instruction::SExt && SrcTy == Type::Int1Ty) {
+    if (I.getOpcode() == Instruction::SExt && SrcTy == Type::Int1Ty) {
       // Make sure we really get a sext from bool by subtracing the bool from 0
       Out << "0-";
-      writeOperand(I.getOperand(0));
-    } else if (I.getOpcode() == Instruction::SExt &&
-               SrcTy->getTypeID() == Type::IntegerTyID) {
-      IMPL_SIGN_EXTENSION(SrcTy, writeOperand(I.getOperand(0)) );
-    } else if (I.getOpcode() == Instruction::ZExt &&
-               SrcTy->getTypeID() == Type::IntegerTyID) {
-      const IntegerType* IntTy = cast(SrcTy);
-      uint64_t BitMask = IntTy->getBitMask();
-      writeOperand(I.getOperand(0));
-      Out << "&" << BitMask << (IntTy->getBitWidth() <=32 ? "U": "ULL");
     }
-    else
-      writeOperand(I.getOperand(0));
+    writeOperand(I.getOperand(0));
+    if (DstTy == Type::Int1Ty && 
+        (I.getOpcode() == Instruction::Trunc ||
+         I.getOpcode() == Instruction::FPToUI ||
+         I.getOpcode() == Instruction::FPToSI ||
+         I.getOpcode() == Instruction::PtrToInt)) {
+      // Make sure we really get a trunc to bool by anding the operand with 1 
+      Out << "&1u";
+    }
   }
-  Out << ")";
+  Out << ')';
 }
 
 void CWriter::visitSelectInst(SelectInst &I) {





From rspencer at reidspencer.com  Wed May  2 23:06:57 2007
From: rspencer at reidspencer.com (Reid Spencer)
Date: Thu, 03 May 2007 00:06:57 -0400
Subject: [llvm-commits] CVS: llvm/lib/Target/CBackend/CBackend.cpp
In-Reply-To: <200705030257.l432vVKZ031983@zion.cs.uiuc.edu>
References: <200705030257.l432vVKZ031983@zion.cs.uiuc.edu>
Message-ID: 

Leo,

Looks like Chris didn't wait very long before reverting the CBE patch.  Please try your patch again. It *must* pass all of llvm/test and llvm-test to be accepted.

Thanks,

Reid.

On Wed, 2 May 2007 21:57:31 -0500
 Chris Lattner  wrote:
>
>
>Changes in directory llvm/lib/Target/CBackend:
>
>CBackend.cpp updated: 1.342 -> 1.343
>---
>Log message:
>
>revert reid's patch to fix these failures:
>test/CodeGen/CBackend/2007-01-08-ParamAttr-ICmp.ll for PR1099: http://llvm.org/PR1099  [DEJAGNU]
>Applications/SPASS/SPASS [CBE] 
>Regression/C/2004-03-15-IndirectGoto [CBE] 
>
>
>
>---
>Diffs of the changes:  (+28 -100)
>
> CBackend.cpp |  128 ++++++++++++-----------------------------------------------
> 1 files changed, 28 insertions(+), 100 deletions(-)
>
>
>Index: llvm/lib/Target/CBackend/CBackend.cpp
>diff -u llvm/lib/Target/CBackend/CBackend.cpp:1.342 llvm/lib/Target/CBackend/CBackend.cpp:1.343
>--- llvm/lib/Target/CBackend/CBackend.cpp:1.342	Wed May  2 20:11:53 2007
>+++ llvm/lib/Target/CBackend/CBackend.cpp	Wed May  2 21:57:13 2007
>@@ -412,29 +412,6 @@
>   }
> }
> 
>-#define IMPL_SIGN_EXTENSION(OpTy, Func) { \
>-      const IntegerType* IntTy = cast(OpTy); \
>-      unsigned BitWidth = IntTy->getBitWidth(); \
>-      if (BitWidth != 8 && BitWidth != 16 && BitWidth != 32 && \
>-          BitWidth != 64 && BitWidth != 128) { \
>-        const char * Suffix; \
>-        if (BitWidth <=32)\
>-          Suffix = "U"; \
>-        else \
>-          Suffix = "ULL"; \
>-        Out << "("; \
>-        Func; \
>-        Out << " & (1" << Suffix << " << " << BitWidth - 1 << " ) ? "; \
>-        Func; \
>-        Out << " | " << (~IntTy->getBitMask()) << Suffix << " : "; \
>-        Func; \
>-        Out << " & " << IntTy->getBitMask() << Suffix; \
>-        Out << ")";\
>-       } \
>-      else \
>-        Func; \
>-      }
>-
> // Pass the Type* and the variable name and this prints out the variable
> // declaration.
> //
>@@ -734,39 +711,23 @@
>     case Instruction::BitCast:
>       Out << "(";
>       printCast(CE->getOpcode(), CE->getOperand(0)->getType(), CE->getType());
>-       if (CE->getOpcode() == Instruction::Trunc ||
>-           CE->getOpcode() == Instruction::FPToUI ||
>-           CE->getOpcode() == Instruction::FPToSI ||
>-           CE->getOpcode() == Instruction::PtrToInt) {
>-        if (const IntegerType* IntTy = dyn_cast(CE->getType())) {
>-          uint64_t BitMask = IntTy->getBitMask();
>-          printConstant(CE->getOperand(0));
>-          Out << "&" << BitMask << (IntTy->getBitWidth() <=32 ? "U": "ULL");
>-        }
>-      }
>-      else if (CE->getOpcode() == Instruction::SExt &&
>-               CE->getOperand(0)->getType() == Type::Int1Ty) {
>+      if (CE->getOpcode() == Instruction::SExt &&
>+          CE->getOperand(0)->getType() == Type::Int1Ty) {
>         // Make sure we really sext from bool here by subtracting from 0
>         Out << "0-";
>-        printConstant(CE->getOperand(0));
>       }
>-      else if (CE->getOpcode() == Instruction::SExt &&
>-               CE->getOperand(0)->getType()->getTypeID() == Type::IntegerTyID) {
>-         IMPL_SIGN_EXTENSION(CE->getOperand(0)->getType(),
>-                             printConstant(CE->getOperand(0)));
>-       }
>-       else if (CE->getOpcode() == Instruction::ZExt &&
>-                CE->getOperand(0)->getType()->getTypeID() == Type::IntegerTyID){
>-         const IntegerType* IntTy = 
>-           cast(CE->getOperand(0)->getType());
>-         uint64_t BitMask = IntTy->getBitMask();
>-         writeOperand(CE->getOperand(0));
>-         Out << "&" << BitMask << (IntTy->getBitWidth() <=32 ? "U": "ULL");
>-       }
>-       else
>-         printConstant(CE->getOperand(0));
>-      Out << ")";
>+      printConstant(CE->getOperand(0));
>+      if (CE->getType() == Type::Int1Ty &&
>+          (CE->getOpcode() == Instruction::Trunc ||
>+           CE->getOpcode() == Instruction::FPToUI ||
>+           CE->getOpcode() == Instruction::FPToSI ||
>+           CE->getOpcode() == Instruction::PtrToInt)) {
>+        // Make sure we really truncate to bool here by anding with 1
>+        Out << "&1u";
>+      }
>+      Out << ')';
>       return;
>+
>     case Instruction::GetElementPtr:
>       Out << "(&(";
>       printIndexingExpression(CE->getOperand(0), gep_type_begin(CPV),
>@@ -1267,11 +1228,7 @@
>     Out << "((";
>     printSimpleType(Out, OpTy, castIsSigned);
>     Out << ")";
>-    if (castIsSigned && OpTy->getTypeID() == Type::IntegerTyID) {
>-      IMPL_SIGN_EXTENSION(OpTy, writeOperand(Operand));
>-    }
>-    else
>-      writeOperand(Operand);
>+    writeOperand(Operand);
>     Out << ")";
>   } else 
>     writeOperand(Operand);
>@@ -1296,9 +1253,7 @@
>   switch (predicate) {
>     default:
>       // for eq and ne, it doesn't matter
>-      break;
>-    case ICmpInst::ICMP_EQ:
>-    case ICmpInst::ICMP_NE:
>+      break; 
>     case ICmpInst::ICMP_UGT:
>     case ICmpInst::ICMP_UGE:
>     case ICmpInst::ICMP_ULT:
>@@ -1323,25 +1278,10 @@
>     else
>       printType(Out, OpTy); // not integer, sign doesn't matter
>     Out << ")";
>-    if(castIsSigned && OpTy->getTypeID() == Type::IntegerTyID) {
>-      IMPL_SIGN_EXTENSION(OpTy, writeOperand(Operand));
>-    } else {
>-      writeOperand(Operand);
>-      if(OpTy->getTypeID() == Type::IntegerTyID){
>-        const IntegerType * IntTy = cast(OpTy);
>-        uint64_t BitMask = IntTy->getBitMask();
>-        Out << "&" << BitMask << (IntTy->getBitWidth() <=32 ? "U": "ULL");
>-      }
>-    }
>+    writeOperand(Operand);
>     Out << ")";
>-  } else {
>+  } else 
>     writeOperand(Operand);
>-    if(OpTy->getTypeID() == Type::IntegerTyID){
>-      const IntegerType * IntTy = cast(OpTy);
>-      uint64_t BitMask = IntTy->getBitMask();
>-      Out << "&" << BitMask << (IntTy->getBitWidth() <=32 ? "U": "ULL");
>-    }
>-  }
> }
> 
> // generateCompilerSpecificCode - This is where we add conditional compilation
>@@ -2406,33 +2346,21 @@
>         << getFloatBitCastField(I.getType());
>   } else {
>     printCast(I.getOpcode(), SrcTy, DstTy);
>-    if (I.getOpcode() == Instruction::Trunc ||
>-        I.getOpcode() == Instruction::FPToUI ||
>-        I.getOpcode() == Instruction::FPToSI ||
>-        I.getOpcode() == Instruction::PtrToInt) {
>-      if (const IntegerType* IntTy = dyn_cast(DstTy)){
>-        uint64_t BitMask = IntTy->getBitMask();
>-        writeOperand(I.getOperand(0));
>-        Out << "&" << BitMask << (IntTy->getBitWidth() <=32 ? "U": "ULL");
>-      }
>-    } else if (I.getOpcode() == Instruction::SExt && SrcTy == Type::Int1Ty) {
>+    if (I.getOpcode() == Instruction::SExt && SrcTy == Type::Int1Ty) {
>       // Make sure we really get a sext from bool by subtracing the bool from 0
>       Out << "0-";
>-      writeOperand(I.getOperand(0));
>-    } else if (I.getOpcode() == Instruction::SExt &&
>-               SrcTy->getTypeID() == Type::IntegerTyID) {
>-      IMPL_SIGN_EXTENSION(SrcTy, writeOperand(I.getOperand(0)) );
>-    } else if (I.getOpcode() == Instruction::ZExt &&
>-               SrcTy->getTypeID() == Type::IntegerTyID) {
>-      const IntegerType* IntTy = cast(SrcTy);
>-      uint64_t BitMask = IntTy->getBitMask();
>-      writeOperand(I.getOperand(0));
>-      Out << "&" << BitMask << (IntTy->getBitWidth() <=32 ? "U": "ULL");
>     }
>-    else
>-      writeOperand(I.getOperand(0));
>+    writeOperand(I.getOperand(0));
>+    if (DstTy == Type::Int1Ty && 
>+        (I.getOpcode() == Instruction::Trunc ||
>+         I.getOpcode() == Instruction::FPToUI ||
>+         I.getOpcode() == Instruction::FPToSI ||
>+         I.getOpcode() == Instruction::PtrToInt)) {
>+      // Make sure we really get a trunc to bool by anding the operand with 1 
>+      Out << "&1u";
>+    }
>   }
>-  Out << ")";
>+  Out << ')';
> }
> 
> void CWriter::visitSelectInst(SelectInst &I) {
>
>
>
>_______________________________________________
>llvm-commits mailing list
>llvm-commits at cs.uiuc.edu
>http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From reid at x10sys.com  Thu May  3 06:17:17 2007
From: reid at x10sys.com (Reid Spencer)
Date: Thu, 3 May 2007 06:17:17 -0500
Subject: [llvm-commits] CVS: llvm-www/DevMtgMay2007.html
Message-ID: <200705031117.l43BHH0U024893@zion.cs.uiuc.edu>



Changes in directory llvm-www:

DevMtgMay2007.html updated: 1.116 -> 1.117
---
Log message:

Add Kelly Wilson.


---
Diffs of the changes:  (+5 -4)

 DevMtgMay2007.html |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)


Index: llvm-www/DevMtgMay2007.html
diff -u llvm-www/DevMtgMay2007.html:1.116 llvm-www/DevMtgMay2007.html:1.117
--- llvm-www/DevMtgMay2007.html:1.116	Tue May  1 20:42:00 2007
+++ llvm-www/DevMtgMay2007.html	Thu May  3 06:16:53 2007
@@ -312,13 +312,13 @@
     
+    
   Speaker Topic
Evan Cheng Back end talk
   
Nick Lewycky
     Design and implementation of the PredicateSimplifier pass, or, 
       "VRP in LLVM"
Name Organization
     Paul McJones Adobe Systems Incorporated.
     Scott Michel Aerospace
Alireza Moshtaghi Microchip Technology
     Robert Mykland Ascenium Corp.
     Steve Naroff Apple Inc.
     Devang Patel Apple Inc.
   
 Nick Lewycky Independent
     Efrem Lipkin CoDesign
     Gabe McArthur Independent
Paul McJones Adobe Systems Incorporated.
   
       
       
   
-    
@@ -343,16 +343,17 @@
       
     Confirmed Attendees
     Name Organization
Paul McJones Adobe Systems Incorporated.
     Scott Michel Aerospace
     Alireza Moshtaghi Microchip Technology
     Robert Mykland Ascenium Corp.
     
   
-  Total confirmed: 40
+  Total confirmed: 41
   
+    
     Unconfirmed Attendees
     Name Organization
     Rafael Espindola Google
     Lang Hames University of Sydney
     Michael McCracken UCSD, Ph.D. Candidate
Kelly Wilson University of Calgary
     Unconfirmed 1 NASA, Ames
   
-  Total unconfirmed: 4
+  Total unconfirmed: 5
 

Unconfirmed Attendees
Name	Organization
Scott Michel	Building The Cell BE Symbiotic Processor Element Backend: Practice and Experience
John Criswell	UIUC Research, TBA
Jeff Cohen	Using LLVM in the Jolt compiler

Speaker	Topic
Evan Cheng	Back end talk
Nick Lewycky	Design and implementation of the PredicateSimplifier pass, or, "VRP in LLVM"
Name	Organization
Paul McJones	Adobe Systems Incorporated.
Scott Michel	Aerospace
Alireza Moshtaghi	Microchip Technology
Robert Mykland	Ascenium Corp.
Steve Naroff	Apple Inc.
Devang Patel	Apple Inc.
Nick Lewycky	Independent
Efrem Lipkin	CoDesign
Gabe McArthur	Independent
Paul McJones	Adobe Systems Incorporated.

Unconfirmed Attendees
Name	Organization
Rafael Espindola	Google
Lang Hames	University of Sydney
Michael McCracken	UCSD, Ph.D. Candidate
Kelly Wilson	University of Calgary
Unconfirmed 1	NASA, Ames