[llvm-commits] CVS: llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp

[Chris Lattner]

Changes in directory llvm/lib/CodeGen/SelectionDAG:

SelectionDAGISel.cpp updated: 1.34 -> 1.35
---
Log message:

Fix a bug that andrew noticed where we do not correctly sign/zero extend
returned integer values all of the way to 64-bits (we only did it to 32-bits
leaving the top bits undefined).  This causes problems for targets like alpha
whose ABI's define the top bits too.


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

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


Index: llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.34 llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.35
--- llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.34	Fri Mar 25 19:29:23 2005
+++ llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp	Tue Mar 29 13:09:56 2005
@@ -378,22 +378,31 @@
   }
 
   SDOperand Op1 = getValue(I.getOperand(0));
+  MVT::ValueType TmpVT;
+
   switch (Op1.getValueType()) {
   default: assert(0 && "Unknown value type!");
   case MVT::i1:
   case MVT::i8:
   case MVT::i16:
-    // Extend integer types to 32-bits.
+  case MVT::i32:
+    // If this is a machine where 32-bits is legal or expanded, promote to
+    // 32-bits, otherwise, promote to 64-bits.
+    if (TLI.getTypeAction(MVT::i32) == TargetLowering::Promote)
+      TmpVT = TLI.getTypeToTransformTo(MVT::i32);
+    else
+      TmpVT = MVT::i32;
+
+    // Extend integer types to result type.
     if (I.getOperand(0)->getType()->isSigned())
-      Op1 = DAG.getNode(ISD::SIGN_EXTEND, MVT::i32, Op1);
+      Op1 = DAG.getNode(ISD::SIGN_EXTEND, TmpVT, Op1);
     else
-      Op1 = DAG.getNode(ISD::ZERO_EXTEND, MVT::i32, Op1);
+      Op1 = DAG.getNode(ISD::ZERO_EXTEND, TmpVT, Op1);
     break;
   case MVT::f32:
     // Extend float to double.
     Op1 = DAG.getNode(ISD::FP_EXTEND, MVT::f64, Op1);
     break;
-  case MVT::i32:
   case MVT::i64:
   case MVT::f64:
     break; // No extension needed!