diff options
author | Eric Christopher <echristo@gmail.com> | 2016-12-01 07:50:12 +0000 |
---|---|---|
committer | Eric Christopher <echristo@gmail.com> | 2016-12-01 07:50:12 +0000 |
commit | e70b7c3dfb0e740dc47540ca8d5b92d6d58551bf (patch) | |
tree | b8adc0dd00ee9b06e5b7a4610ce7a9b02bc76071 /llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp | |
parent | d64ecf26e7efc471882283fcd7a907ee192c1358 (diff) | |
download | bcm5719-llvm-e70b7c3dfb0e740dc47540ca8d5b92d6d58551bf.tar.gz bcm5719-llvm-e70b7c3dfb0e740dc47540ca8d5b92d6d58551bf.zip |
Temporarily Revert "Move most EH from MachineModuleInfo to MachineFunction"
This apprears to have broken the global isel bot:
http://lab.llvm.org:8080/green/job/clang-stage1-cmake-RA-globalisel_build/5174/console
This reverts commit r288293.
llvm-svn: 288322
Diffstat (limited to 'llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp')
-rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp index 6d717b44eb7..16e01395f2b 100644 --- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp @@ -1014,10 +1014,10 @@ bool SelectionDAGISel::PrepareEHLandingPad() { // Add a label to mark the beginning of the landing pad. Deletion of the // landing pad can thus be detected via the MachineModuleInfo. - MCSymbol *Label = MF->addLandingPad(MBB); + MCSymbol *Label = MF->getMMI().addLandingPad(MBB); // Assign the call site to the landing pad's begin label. - MF->setCallSiteLandingPad(Label, SDB->LPadToCallSiteMap[MBB]); + MF->getMMI().setCallSiteLandingPad(Label, SDB->LPadToCallSiteMap[MBB]); const MCInstrDesc &II = TII->get(TargetOpcode::EH_LABEL); BuildMI(*MBB, FuncInfo->InsertPt, SDB->getCurDebugLoc(), II) |