Commit 840845a1 authored by Amy Huang's avatar Amy Huang
Browse files

Fix merge issues in b288f7d6

parent b288f7d6

llvm/lib/CodeGen/MachineFunction.cpp

+3 −6
Original line number Diff line number Diff line
@@ -822,12 +822,9 @@ try_next:; 
  return FilterID;

}



void MachineFunction::moveCallSiteInfo(const MachineInstr *Old,

void MachineFunction::updateCallSiteInfo(const MachineInstr *Old,

                                         const MachineInstr *New) {

  assert(New->isCall() && "Call site info refers only to call instructions!");



  CallSiteInfoMap::iterator CSIt = getCallSiteInfo(Old);

  if (CSIt == CallSitesInfo.end())

  if (!Target.Options.EnableDebugEntryValues || Old == New)

    return;



  assert(Old->isCall() && (!New || New->isCall()) &&

llvm/unittests/CodeGen/MachineInstrTest.cpp

+8 −8
Original line number Diff line number Diff line
@@ -139,11 +139,8 @@ private: 
  BogusSubtarget ST;

};



static MCAsmInfo AsmInfo = MCAsmInfo();



std::unique_ptr<MCContext> createMCContext() {

  return std::make_unique<MCContext>(

      &AsmInfo, nullptr, nullptr, nullptr, nullptr, false);

std::unique_ptr<MCContext> createMCContext(MCAsmInfo *AsmInfo) {

  return std::make_unique<MCContext>(AsmInfo, nullptr, nullptr, nullptr, false);

}



std::unique_ptr<BogusTargetMachine> createTargetMachine() {
@@ -378,7 +375,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 +422,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 +459,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;