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/Target/X86/X86ISelLowering.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/Target/X86/X86ISelLowering.cpp')
| -rw-r--r-- | llvm/lib/Target/X86/X86ISelLowering.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/llvm/lib/Target/X86/X86ISelLowering.cpp b/llvm/lib/Target/X86/X86ISelLowering.cpp index 99142ee6cfe..3e2f5f1ab7c 100644 --- a/llvm/lib/Target/X86/X86ISelLowering.cpp +++ b/llvm/lib/Target/X86/X86ISelLowering.cpp @@ -24980,6 +24980,7 @@ X86TargetLowering::EmitSjLjDispatchBlock(MachineInstr &MI, MachineBasicBlock *BB) const { DebugLoc DL = MI.getDebugLoc(); MachineFunction *MF = BB->getParent(); + MachineModuleInfo *MMI = &MF->getMMI(); MachineFrameInfo &MFI = MF->getFrameInfo(); MachineRegisterInfo *MRI = &MF->getRegInfo(); const TargetInstrInfo *TII = Subtarget.getInstrInfo(); @@ -25003,10 +25004,10 @@ X86TargetLowering::EmitSjLjDispatchBlock(MachineInstr &MI, break; } - if (!MF->hasCallSiteLandingPad(Sym)) + if (!MMI->hasCallSiteLandingPad(Sym)) continue; - for (unsigned CSI : MF->getCallSiteLandingPad(Sym)) { + for (unsigned CSI : MMI->getCallSiteLandingPad(Sym)) { CallSiteNumToLPad[CSI].push_back(&MBB); MaxCSNum = std::max(MaxCSNum, CSI); } |
