Promote line and column number information for our friendly 64-bit targets.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@24568 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp b/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
index e3d20e480f0fed5ce5102e84823d92058a3a718c..0690c641db6d8d8b6e32397c8e0cc1903fd3231c 100644 (file)
--- a/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
+++ b/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
@@ -615,11 +615,18 @@ SDOperand SelectionDAGLegalize::LegalizeOp(SDOperand Op) {
       Result = Tmp1;
       break;
     case TargetLowering::Legal:
-      if (Tmp1 != Node->getOperand(0)) {
+      if (Tmp1 != Node->getOperand(0) ||
+          getTypeAction(Node->getOperand(1).getValueType()) == Promote) {
         std::vector<SDOperand> Ops;
         Ops.push_back(Tmp1);
-        Ops.push_back(Node->getOperand(1));  // line # must be legal.
-        Ops.push_back(Node->getOperand(2));  // col # must be legal.
+        if (getTypeAction(Node->getOperand(1).getValueType()) == Legal) {
+          Ops.push_back(Node->getOperand(1));  // line # must be legal.
+          Ops.push_back(Node->getOperand(2));  // col # must be legal.
+        } else {
+          // Otherwise promote them.
+          Ops.push_back(PromoteOp(Node->getOperand(1)));
+          Ops.push_back(PromoteOp(Node->getOperand(2)));
+        }
         Ops.push_back(Node->getOperand(3));  // filename must be legal.
         Ops.push_back(Node->getOperand(4));  // working dir # must be legal.
         Result = DAG.getNode(ISD::LOCATION, MVT::Other, Ops);