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/X86CallFrameOptimization.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/X86CallFrameOptimization.cpp')
| -rw-r--r-- | llvm/lib/Target/X86/X86CallFrameOptimization.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Target/X86/X86CallFrameOptimization.cpp b/llvm/lib/Target/X86/X86CallFrameOptimization.cpp index 25d1c51d28f..8912e50d75d 100644 --- a/llvm/lib/Target/X86/X86CallFrameOptimization.cpp +++ b/llvm/lib/Target/X86/X86CallFrameOptimization.cpp @@ -129,7 +129,7 @@ bool X86CallFrameOptimization::isLegal(MachineFunction &MF) { // in the compact unwind encoding that Darwin uses. So, bail if there // is a danger of that being generated. if (STI->isTargetDarwin() && - (!MF.getLandingPads().empty() || + (!MF.getMMI().getLandingPads().empty() || (MF.getFunction()->needsUnwindTableEntry() && !TFL->hasFP(MF)))) return false; |
