[llvm] fdd0815 - Fix initialization-order-fiasco error in "Add a heap alloc site marker field to the ExtraInfo in MachineInstrs"

[Amy Huang via llvm-commits]

Author: Amy Huang
Date: 2019-10-31T10:52:53-07:00
New Revision: fdd0815eacb45491ac0f4dccdccc46b498d6fbe1

URL: https://github.com/llvm/llvm-project/commit/fdd0815eacb45491ac0f4dccdccc46b498d6fbe1
DIFF: https://github.com/llvm/llvm-project/commit/fdd0815eacb45491ac0f4dccdccc46b498d6fbe1.diff

LOG: Fix initialization-order-fiasco error in "Add a heap alloc site marker field to the ExtraInfo in MachineInstrs"

Added: 
    

Modified: 
    llvm/unittests/CodeGen/MachineInstrTest.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/unittests/CodeGen/MachineInstrTest.cpp b/llvm/unittests/CodeGen/MachineInstrTest.cpp
index 9e455548e152..90c8a4049e2a 100644
--- a/llvm/unittests/CodeGen/MachineInstrTest.cpp
+++ b/llvm/unittests/CodeGen/MachineInstrTest.cpp
@@ -139,11 +139,9 @@ class BogusTargetMachine : public LLVMTargetMachine {
   BogusSubtarget ST;
 };
 
-static MCAsmInfo AsmInfo = MCAsmInfo();
-
-std::unique_ptr<MCContext> createMCContext() {
+std::unique_ptr<MCContext> createMCContext(MCAsmInfo *AsmInfo) {
   return std::make_unique<MCContext>(
-      &AsmInfo, nullptr, nullptr, nullptr, nullptr, false);
+      AsmInfo, nullptr, nullptr, nullptr, nullptr, false);
 }
 
 std::unique_ptr<BogusTargetMachine> createTargetMachine() {
@@ -378,7 +376,8 @@ TEST(MachineInstrExtraInfo, AddExtraInfo) {
                       0, nullptr, nullptr, nullptr, 0, nullptr};
 
   auto MI = MF->CreateMachineInstr(MCID, DebugLoc());
-  auto MC = createMCContext();
+  auto MAI = MCAsmInfo();
+  auto MC = createMCContext(&MAI);
   auto MMO = MF->getMachineMemOperand(MachinePointerInfo(),
                                       MachineMemOperand::MOLoad, 8, 8);
   SmallVector<MachineMemOperand *, 2> MMOs;
@@ -424,7 +423,8 @@ TEST(MachineInstrExtraInfo, ChangeExtraInfo) {
                       0, nullptr, nullptr, nullptr, 0, nullptr};
 
   auto MI = MF->CreateMachineInstr(MCID, DebugLoc());
-  auto MC = createMCContext();
+  auto MAI = MCAsmInfo();
+  auto MC = createMCContext(&MAI);
   auto MMO = MF->getMachineMemOperand(MachinePointerInfo(),
                                       MachineMemOperand::MOLoad, 8, 8);
   SmallVector<MachineMemOperand *, 2> MMOs;
@@ -460,7 +460,8 @@ TEST(MachineInstrExtraInfo, RemoveExtraInfo) {
                       0, nullptr, nullptr, nullptr, 0, nullptr};
 
   auto MI = MF->CreateMachineInstr(MCID, DebugLoc());
-  auto MC = createMCContext();
+  auto MAI = MCAsmInfo();
+  auto MC = createMCContext(&MAI);
   auto MMO = MF->getMachineMemOperand(MachinePointerInfo(),
                                       MachineMemOperand::MOLoad, 8, 8);
   SmallVector<MachineMemOperand *, 2> MMOs;