[llvm] r336861 - AMDGPU/SI: Initialize InstrInfo before TargetLoweringInfo in GCNSubtarget

[Tom Stellard via llvm-commits]

Author: tstellar
Date: Wed Jul 11 15:15:15 2018
New Revision: 336861

URL: http://llvm.org/viewvc/llvm-project?rev=336861&view=rev
Log:
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.

Modified:
    llvm/trunk/lib/Target/AMDGPU/AMDGPUSubtarget.cpp
    llvm/trunk/lib/Target/AMDGPU/AMDGPUSubtarget.h

Modified: llvm/trunk/lib/Target/AMDGPU/AMDGPUSubtarget.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/AMDGPUSubtarget.cpp?rev=336861&r1=336860&r2=336861&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AMDGPU/AMDGPUSubtarget.cpp (original)
+++ llvm/trunk/lib/Target/AMDGPU/AMDGPUSubtarget.cpp Wed Jul 11 15:15:15 2018
@@ -208,8 +208,8 @@ GCNSubtarget::GCNSubtarget(const Triple
     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()));

Modified: llvm/trunk/lib/Target/AMDGPU/AMDGPUSubtarget.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/AMDGPUSubtarget.h?rev=336861&r1=336860&r2=336861&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AMDGPU/AMDGPUSubtarget.h (original)
+++ llvm/trunk/lib/Target/AMDGPU/AMDGPUSubtarget.h Wed Jul 11 15:15:15 2018
@@ -362,8 +362,8 @@ protected:
   SelectionDAGTargetInfo TSInfo;
   AMDGPUAS AS;
 private:
-  SITargetLowering TLInfo;
   SIInstrInfo InstrInfo;
+  SITargetLowering TLInfo;
   SIFrameLowering FrameLowering;
 
 public: