From 13c73e483623c75d1239d5ea6856eab12d7547af Mon Sep 17 00:00:00 2001 From: Evan Cheng Date: Fri, 1 Apr 2011 19:42:22 +0000 Subject: [PATCH] Assign node order numbers to results of call instruction lowering. This should improve src line debug info when sdisel is used. rdar://9199118 llvm-svn: 128728 --- lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp index 18d5a7a9ee4..94923530895 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp @@ -4927,15 +4927,19 @@ void SelectionDAGBuilder::LowerCallTo(ImmutableCallSite CS, SDValue Callee, DAG.getNode(ISD::MERGE_VALUES, getCurDebugLoc(), DAG.getVTList(&RetTys[0], RetTys.size()), &ReturnValues[0], ReturnValues.size())); - } // As a special case, a null chain means that a tail call has been emitted and // the DAG root is already updated. - if (Result.second.getNode()) - DAG.setRoot(Result.second); - else + if (!Result.second.getNode()) { HasTailCall = true; + ++SDNodeOrder; + AssignOrderingToNode(DAG.getRoot().getNode()); + } else { + DAG.setRoot(Result.second); + ++SDNodeOrder; + AssignOrderingToNode(Result.second.getNode()); + } if (LandingPad) { // Insert a label at the end of the invoke call to mark the try range. This