mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-25 16:29:20 +00:00
Fix null reference creation in SelectionDAG constructor.
Store TargetSelectionDAGInfo as a pointer instead of a reference: getSelectionDAGInfo() may not be implemented for certain backends (e.g. it's not currently implemented for R600). This bug is reported by UBSan. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@216129 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
145d28e73b
commit
fa210acc3b
@ -168,7 +168,7 @@ void checkForCycles(const SelectionDAG *DAG, bool force = false);
|
||||
///
|
||||
class SelectionDAG {
|
||||
const TargetMachine &TM;
|
||||
const TargetSelectionDAGInfo &TSI;
|
||||
const TargetSelectionDAGInfo *TSI;
|
||||
const TargetLowering *TLI;
|
||||
MachineFunction *MF;
|
||||
LLVMContext *Context;
|
||||
@ -279,7 +279,7 @@ public:
|
||||
const TargetMachine &getTarget() const { return TM; }
|
||||
const TargetSubtargetInfo &getSubtarget() const { return MF->getSubtarget(); }
|
||||
const TargetLowering &getTargetLoweringInfo() const { return *TLI; }
|
||||
const TargetSelectionDAGInfo &getSelectionDAGInfo() const { return TSI; }
|
||||
const TargetSelectionDAGInfo &getSelectionDAGInfo() const { return *TSI; }
|
||||
LLVMContext *getContext() const {return Context; }
|
||||
|
||||
/// viewGraph - Pop up a GraphViz/gv window with the DAG rendered using 'dot'.
|
||||
|
@ -907,7 +907,7 @@ unsigned SelectionDAG::getEVTAlignment(EVT VT) const {
|
||||
|
||||
// EntryNode could meaningfully have debug info if we can find it...
|
||||
SelectionDAG::SelectionDAG(const TargetMachine &tm, CodeGenOpt::Level OL)
|
||||
: TM(tm), TSI(*tm.getSubtargetImpl()->getSelectionDAGInfo()), TLI(nullptr),
|
||||
: TM(tm), TSI(tm.getSubtargetImpl()->getSelectionDAGInfo()), TLI(nullptr),
|
||||
OptLevel(OL),
|
||||
EntryNode(ISD::EntryToken, 0, DebugLoc(), getVTList(MVT::Other)),
|
||||
Root(getEntryNode()), NewNodesMustHaveLegalTypes(false),
|
||||
@ -4228,9 +4228,8 @@ SDValue SelectionDAG::getMemcpy(SDValue Chain, SDLoc dl, SDValue Dst,
|
||||
// Then check to see if we should lower the memcpy with target-specific
|
||||
// code. If the target chooses to do this, this is the next best.
|
||||
SDValue Result =
|
||||
TSI.EmitTargetCodeForMemcpy(*this, dl, Chain, Dst, Src, Size, Align,
|
||||
isVol, AlwaysInline,
|
||||
DstPtrInfo, SrcPtrInfo);
|
||||
TSI->EmitTargetCodeForMemcpy(*this, dl, Chain, Dst, Src, Size, Align,
|
||||
isVol, AlwaysInline, DstPtrInfo, SrcPtrInfo);
|
||||
if (Result.getNode())
|
||||
return Result;
|
||||
|
||||
@ -4296,9 +4295,8 @@ SDValue SelectionDAG::getMemmove(SDValue Chain, SDLoc dl, SDValue Dst,
|
||||
|
||||
// Then check to see if we should lower the memmove with target-specific
|
||||
// code. If the target chooses to do this, this is the next best.
|
||||
SDValue Result =
|
||||
TSI.EmitTargetCodeForMemmove(*this, dl, Chain, Dst, Src, Size, Align, isVol,
|
||||
DstPtrInfo, SrcPtrInfo);
|
||||
SDValue Result = TSI->EmitTargetCodeForMemmove(
|
||||
*this, dl, Chain, Dst, Src, Size, Align, isVol, DstPtrInfo, SrcPtrInfo);
|
||||
if (Result.getNode())
|
||||
return Result;
|
||||
|
||||
@ -4351,9 +4349,8 @@ SDValue SelectionDAG::getMemset(SDValue Chain, SDLoc dl, SDValue Dst,
|
||||
|
||||
// Then check to see if we should lower the memset with target-specific
|
||||
// code. If the target chooses to do this, this is the next best.
|
||||
SDValue Result =
|
||||
TSI.EmitTargetCodeForMemset(*this, dl, Chain, Dst, Src, Size, Align, isVol,
|
||||
DstPtrInfo);
|
||||
SDValue Result = TSI->EmitTargetCodeForMemset(*this, dl, Chain, Dst, Src,
|
||||
Size, Align, isVol, DstPtrInfo);
|
||||
if (Result.getNode())
|
||||
return Result;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user