RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-21 03:53:04 +02:00
Code Issues Projects Releases Wiki Activity

AMDGPU/SI: Initialize InstrInfo before TargetLoweringInfo in GCNSubtarget

Browse Source 
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 e5ef1d09c1
commit c7b02c4b43
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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