From 752ddbd0684a5173071ed22a7fa289a09e72d020 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Wed, 11 Jul 2018 22:15:15 +0000
Subject: [PATCH] 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
---
 llvm/lib/Target/AMDGPU/AMDGPUSubtarget.cpp | 4 ++--
 llvm/lib/Target/AMDGPU/AMDGPUSubtarget.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/llvm/lib/Target/AMDGPU/AMDGPUSubtarget.cpp b/llvm/lib/Target/AMDGPU/AMDGPUSubtarget.cpp
index 6156334..3efc564 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPUSubtarget.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPUSubtarget.cpp
@@ -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()));
diff --git a/llvm/lib/Target/AMDGPU/AMDGPUSubtarget.h b/llvm/lib/Target/AMDGPU/AMDGPUSubtarget.h
index ae41f9e..d9806d6 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPUSubtarget.h
+++ b/llvm/lib/Target/AMDGPU/AMDGPUSubtarget.h
@@ -362,8 +362,8 @@ protected:
   SelectionDAGTargetInfo TSInfo;
   AMDGPUAS AS;
 private:
-  SITargetLowering TLInfo;
   SIInstrInfo InstrInfo;
+  SITargetLowering TLInfo;
   SIFrameLowering FrameLowering;
 
 public:
-- 
2.7.4