diff options
| author | Amy Huang <akhuang@google.com> | 2019-10-31 10:48:52 -0700 |
|---|---|---|
| committer | Amy Huang <akhuang@google.com> | 2019-10-31 10:52:53 -0700 |
| commit | fdd0815eacb45491ac0f4dccdccc46b498d6fbe1 (patch) | |
| tree | 47678d36b8d75a5f5ef355187a034e30fae431f6 /llvm/unittests/CodeGen/MachineInstrTest.cpp | |
| parent | 2179867ddc2990b141d53ade1d66fc1af66b412e (diff) | |
| download | bcm5719-llvm-fdd0815eacb45491ac0f4dccdccc46b498d6fbe1.tar.gz bcm5719-llvm-fdd0815eacb45491ac0f4dccdccc46b498d6fbe1.zip | |
Fix initialization-order-fiasco error in "Add a heap alloc site marker field to the ExtraInfo in MachineInstrs"
Diffstat (limited to 'llvm/unittests/CodeGen/MachineInstrTest.cpp')
| -rw-r--r-- | llvm/unittests/CodeGen/MachineInstrTest.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/llvm/unittests/CodeGen/MachineInstrTest.cpp b/llvm/unittests/CodeGen/MachineInstrTest.cpp index 9e455548e15..90c8a4049e2 100644 --- a/llvm/unittests/CodeGen/MachineInstrTest.cpp +++ b/llvm/unittests/CodeGen/MachineInstrTest.cpp @@ -139,11 +139,9 @@ private: 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; |
