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

[Evan Cheng]

Changes in directory llvm/lib/Target/X86:

X86ISelDAGToDAG.cpp updated: 1.105 -> 1.106
X86ISelLowering.cpp updated: 1.254 -> 1.255
---
Log message:

Reflects MachineConstantPoolEntry changes.

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

 X86ISelDAGToDAG.cpp |    4 ++--
 X86ISelLowering.cpp |    5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)


Index: llvm/lib/Target/X86/X86ISelDAGToDAG.cpp
diff -u llvm/lib/Target/X86/X86ISelDAGToDAG.cpp:1.105 llvm/lib/Target/X86/X86ISelDAGToDAG.cpp:1.106
--- llvm/lib/Target/X86/X86ISelDAGToDAG.cpp:1.105	Fri Sep  8 01:48:29 2006
+++ llvm/lib/Target/X86/X86ISelDAGToDAG.cpp	Tue Sep 12 16:03:39 2006
@@ -540,7 +540,7 @@
       if (ConstantPoolSDNode *CP =
           dyn_cast<ConstantPoolSDNode>(N.getOperand(0))) {
         if (AM.CP == 0) {
-          AM.CP = CP->get();
+          AM.CP = CP->getConstVal();
           AM.Align = CP->getAlignment();
           AM.Disp += CP->getOffset();
           if (isRIP)
@@ -872,7 +872,7 @@
                                              G->getOffset() + Offset);
         } else if (ConstantPoolSDNode *CP =
                    dyn_cast<ConstantPoolSDNode>(N0.getOperand(0))) {
-          C = CurDAG->getTargetConstantPool(CP->get(), PtrVT,
+          C = CurDAG->getTargetConstantPool(CP->getConstVal(), PtrVT,
                                             CP->getAlignment(),
                                             CP->getOffset()+Offset);
         }


Index: llvm/lib/Target/X86/X86ISelLowering.cpp
diff -u llvm/lib/Target/X86/X86ISelLowering.cpp:1.254 llvm/lib/Target/X86/X86ISelLowering.cpp:1.255
--- llvm/lib/Target/X86/X86ISelLowering.cpp:1.254	Sun Sep 10 21:19:56 2006
+++ llvm/lib/Target/X86/X86ISelLowering.cpp	Tue Sep 12 16:03:39 2006
@@ -3329,8 +3329,9 @@
 X86TargetLowering::LowerConstantPool(SDOperand Op, SelectionDAG &DAG) {
   ConstantPoolSDNode *CP = cast<ConstantPoolSDNode>(Op);
   SDOperand Result = DAG.getNode(X86ISD::Wrapper, getPointerTy(),
-                            DAG.getTargetConstantPool(CP->get(), getPointerTy(),
-                                                      CP->getAlignment()));
+                                 DAG.getTargetConstantPool(CP->getConstVal(),
+                                                           getPointerTy(),
+                                                           CP->getAlignment()));
   if (Subtarget->isTargetDarwin()) {
     // With PIC, the address is actually $g + Offset.
     if (!Subtarget->is64Bit() &&