maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

AMDGPU/SI: Initialize InstrInfo before TargetLoweringInfo in GCNSubtarget 

SITargetLowering queries SIInstrInfo in its constructor, so SIInstrInfo
must be initialized first.  This fixes msan buildbot failures and was
introduced by r336851.

llvm-svn: 336861
This commit is contained in:
Tom Stellard 2018-07-11 22:15:15 +00:00
parent 0f53355e83
commit 752ddbd068
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/lib/Target/AMDGPU/AMDGPUSubtarget.cpp
View File

@ -208,8 +208,8 @@ GCNSubtarget::GCNSubtarget(const Triple &TT, StringRef GPU, StringRef FS,
ScalarizeGlobal(false), ScalarizeGlobal(false),
FeatureDisable(false), FeatureDisable(false),
TLInfo(TM, initializeSubtargetDependencies(TT, GPU, FS)), InstrInfo(initializeSubtargetDependencies(TT, GPU, FS)),
InstrInfo(*this), TLInfo(TM, *this),
FrameLowering(TargetFrameLowering::StackGrowsUp, getStackAlignment(), 0) { FrameLowering(TargetFrameLowering::StackGrowsUp, getStackAlignment(), 0) {
AS = AMDGPU::getAMDGPUAS(TT); AS = AMDGPU::getAMDGPUAS(TT);
CallLoweringInfo.reset(new AMDGPUCallLowering(*getTargetLowering())); CallLoweringInfo.reset(new AMDGPUCallLowering(*getTargetLowering()));

2
llvm/lib/Target/AMDGPU/AMDGPUSubtarget.h
View File

@ -362,8 +362,8 @@ protected:
SelectionDAGTargetInfo TSInfo; SelectionDAGTargetInfo TSInfo;
AMDGPUAS AS; AMDGPUAS AS;
private: private:
SITargetLowering TLInfo;
SIInstrInfo InstrInfo; SIInstrInfo InstrInfo;
SITargetLowering TLInfo;
SIFrameLowering FrameLowering; SIFrameLowering FrameLowering;
public: public: