Skip to content

Commit ac6d9be

Browse files
committed
Track IR ordering of SelectionDAG nodes 2/4.
Change SelectionDAG::getXXXNode() interfaces as well as call sites of these functions to pass in SDLoc instead of DebugLoc. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@182703 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent ea5db0c commit ac6d9be

File tree

74 files changed

+2187
-2190
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+2187
-2190
lines changed

include/llvm/CodeGen/SelectionDAG.h

Lines changed: 88 additions & 88 deletions
Large diffs are not rendered by default.

include/llvm/CodeGen/SelectionDAGNodes.h

Lines changed: 58 additions & 62 deletions
Large diffs are not rendered by default.

include/llvm/Target/TargetLowering.h

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include "llvm/IR/CallingConv.h"
3131
#include "llvm/IR/InlineAsm.h"
3232
#include "llvm/Support/CallSite.h"
33-
#include "llvm/Support/DebugLoc.h"
3433
#include "llvm/Target/TargetCallingConv.h"
3534
#include "llvm/Target/TargetMachine.h"
3635
#include <climits>
@@ -1717,11 +1716,11 @@ class TargetLowering : public TargetLoweringBase {
17171716

17181717
void softenSetCCOperands(SelectionDAG &DAG, EVT VT,
17191718
SDValue &NewLHS, SDValue &NewRHS,
1720-
ISD::CondCode &CCCode, DebugLoc DL) const;
1719+
ISD::CondCode &CCCode, SDLoc DL) const;
17211720

17221721
SDValue makeLibCall(SelectionDAG &DAG, RTLIB::Libcall LC, EVT RetVT,
17231722
const SDValue *Ops, unsigned NumOps,
1724-
bool isSigned, DebugLoc dl) const;
1723+
bool isSigned, SDLoc dl) const;
17251724

17261725
//===--------------------------------------------------------------------===//
17271726
// TargetLowering Optimization Methods
@@ -1761,7 +1760,7 @@ class TargetLowering : public TargetLoweringBase {
17611760
/// cast, but it could be generalized for targets with other types of
17621761
/// implicit widening casts.
17631762
bool ShrinkDemandedOp(SDValue Op, unsigned BitWidth, const APInt &Demanded,
1764-
DebugLoc dl);
1763+
SDLoc dl);
17651764
};
17661765

17671766
/// SimplifyDemandedBits - Look at Op. At this point, we know that only the
@@ -1823,7 +1822,7 @@ class TargetLowering : public TargetLoweringBase {
18231822
/// and cc. If it is unable to simplify it, return a null SDValue.
18241823
SDValue SimplifySetCC(EVT VT, SDValue N0, SDValue N1,
18251824
ISD::CondCode Cond, bool foldBooleans,
1826-
DAGCombinerInfo &DCI, DebugLoc dl) const;
1825+
DAGCombinerInfo &DCI, SDLoc dl) const;
18271826

18281827
/// isGAPlusOffset - Returns true (and the GlobalValue and the offset) if the
18291828
/// node is a GlobalAddress + offset.
@@ -1884,7 +1883,7 @@ class TargetLowering : public TargetLoweringBase {
18841883
LowerFormalArguments(SDValue /*Chain*/, CallingConv::ID /*CallConv*/,
18851884
bool /*isVarArg*/,
18861885
const SmallVectorImpl<ISD::InputArg> &/*Ins*/,
1887-
DebugLoc /*dl*/, SelectionDAG &/*DAG*/,
1886+
SDLoc /*dl*/, SelectionDAG &/*DAG*/,
18881887
SmallVectorImpl<SDValue> &/*InVals*/) const {
18891888
llvm_unreachable("Not Implemented");
18901889
}
@@ -1930,7 +1929,7 @@ class TargetLowering : public TargetLoweringBase {
19301929
SDValue Callee;
19311930
ArgListTy &Args;
19321931
SelectionDAG &DAG;
1933-
DebugLoc DL;
1932+
SDLoc DL;
19341933
ImmutableCallSite *CS;
19351934
SmallVector<ISD::OutputArg, 32> Outs;
19361935
SmallVector<SDValue, 32> OutVals;
@@ -1941,7 +1940,7 @@ class TargetLowering : public TargetLoweringBase {
19411940
/// ImmutableCallSite \p cs.
19421941
CallLoweringInfo(SDValue chain, Type *retTy,
19431942
FunctionType *FTy, bool isTailCall, SDValue callee,
1944-
ArgListTy &args, SelectionDAG &dag, DebugLoc dl,
1943+
ArgListTy &args, SelectionDAG &dag, SDLoc dl,
19451944
ImmutableCallSite &cs)
19461945
: Chain(chain), RetTy(retTy), RetSExt(cs.paramHasAttr(0, Attribute::SExt)),
19471946
RetZExt(cs.paramHasAttr(0, Attribute::ZExt)), IsVarArg(FTy->isVarArg()),
@@ -1958,7 +1957,7 @@ class TargetLowering : public TargetLoweringBase {
19581957
bool isVarArg, bool isInReg, unsigned numFixedArgs,
19591958
CallingConv::ID callConv, bool isTailCall,
19601959
bool doesNotReturn, bool isReturnValueUsed, SDValue callee,
1961-
ArgListTy &args, SelectionDAG &dag, DebugLoc dl)
1960+
ArgListTy &args, SelectionDAG &dag, SDLoc dl)
19621961
: Chain(chain), RetTy(retTy), RetSExt(retSExt), RetZExt(retZExt),
19631962
IsVarArg(isVarArg), IsInReg(isInReg), DoesNotReturn(doesNotReturn),
19641963
IsReturnValueUsed(isReturnValueUsed), IsTailCall(isTailCall),
@@ -2011,7 +2010,7 @@ class TargetLowering : public TargetLoweringBase {
20112010
bool /*isVarArg*/,
20122011
const SmallVectorImpl<ISD::OutputArg> &/*Outs*/,
20132012
const SmallVectorImpl<SDValue> &/*OutVals*/,
2014-
DebugLoc /*dl*/, SelectionDAG &/*DAG*/) const {
2013+
SDLoc /*dl*/, SelectionDAG &/*DAG*/) const {
20152014
llvm_unreachable("Not Implemented");
20162015
}
20172016

@@ -2235,7 +2234,7 @@ class TargetLowering : public TargetLoweringBase {
22352234
//===--------------------------------------------------------------------===//
22362235
// Div utility functions
22372236
//
2238-
SDValue BuildExactSDIV(SDValue Op1, SDValue Op2, DebugLoc dl,
2237+
SDValue BuildExactSDIV(SDValue Op1, SDValue Op2, SDLoc dl,
22392238
SelectionDAG &DAG) const;
22402239
SDValue BuildSDIV(SDNode *N, SelectionDAG &DAG, bool IsAfterLegalization,
22412240
std::vector<SDNode*> *Created) const;

include/llvm/Target/TargetSelectionDAGInfo.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class TargetSelectionDAGInfo {
5454
/// for another call). If the target chooses to decline an AlwaysInline
5555
/// request here, legalize will resort to using simple loads and stores.
5656
virtual SDValue
57-
EmitTargetCodeForMemcpy(SelectionDAG &DAG, DebugLoc dl,
57+
EmitTargetCodeForMemcpy(SelectionDAG &DAG, SDLoc dl,
5858
SDValue Chain,
5959
SDValue Op1, SDValue Op2,
6060
SDValue Op3, unsigned Align, bool isVolatile,
@@ -71,7 +71,7 @@ class TargetSelectionDAGInfo {
7171
/// SDValue if the target declines to use custom code and a different
7272
/// lowering strategy should be used.
7373
virtual SDValue
74-
EmitTargetCodeForMemmove(SelectionDAG &DAG, DebugLoc dl,
74+
EmitTargetCodeForMemmove(SelectionDAG &DAG, SDLoc dl,
7575
SDValue Chain,
7676
SDValue Op1, SDValue Op2,
7777
SDValue Op3, unsigned Align, bool isVolatile,
@@ -87,7 +87,7 @@ class TargetSelectionDAGInfo {
8787
/// SDValue if the target declines to use custom code and a different
8888
/// lowering strategy should be used.
8989
virtual SDValue
90-
EmitTargetCodeForMemset(SelectionDAG &DAG, DebugLoc dl,
90+
EmitTargetCodeForMemset(SelectionDAG &DAG, SDLoc dl,
9191
SDValue Chain,
9292
SDValue Op1, SDValue Op2,
9393
SDValue Op3, unsigned Align, bool isVolatile,

0 commit comments

Comments
 (0)