[llvm-commits] CVS: llvm/lib/Target/X86/X86ISelDAGToDAG.cpp X86RegisterInfo.h

[Jeff Cohen]

Changes in directory llvm/lib/Target/X86:

X86ISelDAGToDAG.cpp updated: 1.121 -> 1.122
X86RegisterInfo.h updated: 1.41 -> 1.42
---
Log message:

Unbreak VC++ build.

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

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


Index: llvm/lib/Target/X86/X86ISelDAGToDAG.cpp
diff -u llvm/lib/Target/X86/X86ISelDAGToDAG.cpp:1.121 llvm/lib/Target/X86/X86ISelDAGToDAG.cpp:1.122
--- llvm/lib/Target/X86/X86ISelDAGToDAG.cpp:1.121	Thu Nov  2 19:13:15 2006
+++ llvm/lib/Target/X86/X86ISelDAGToDAG.cpp	Sun Nov  5 13:31:28 2006
@@ -663,7 +663,7 @@
             AM.IndexReg = ShVal.Val->getOperand(0);
             ConstantSDNode *AddVal =
               cast<ConstantSDNode>(ShVal.Val->getOperand(1));
-            uint64_t Disp = AM.Disp + AddVal->getValue() << Val;
+            uint64_t Disp = AM.Disp + (AddVal->getValue() << Val);
             if (isInt32(Disp))
               AM.Disp = Disp;
             else


Index: llvm/lib/Target/X86/X86RegisterInfo.h
diff -u llvm/lib/Target/X86/X86RegisterInfo.h:1.41 llvm/lib/Target/X86/X86RegisterInfo.h:1.42
--- llvm/lib/Target/X86/X86RegisterInfo.h:1.41	Fri Sep  8 01:48:29 2006
+++ llvm/lib/Target/X86/X86RegisterInfo.h	Sun Nov  5 13:31:28 2006
@@ -22,9 +22,11 @@
   class TargetInstrInfo;
   class X86TargetMachine;
 
-struct X86RegisterInfo : public X86GenRegisterInfo {
+class X86RegisterInfo : public X86GenRegisterInfo {
+public:
   X86TargetMachine &TM;
   const TargetInstrInfo &TII;
+
 private:
   /// Is64Bit - Is the target 64-bits.
   bool Is64Bit;