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/AsmPrinter/ARMException.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/AsmPrinter/ARMException.cpp')
| -rw-r--r-- | llvm/lib/CodeGen/AsmPrinter/ARMException.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/llvm/lib/CodeGen/AsmPrinter/ARMException.cpp b/llvm/lib/CodeGen/AsmPrinter/ARMException.cpp index fff3f003478..5294c98e314 100644 --- a/llvm/lib/CodeGen/AsmPrinter/ARMException.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/ARMException.cpp @@ -75,7 +75,7 @@ void ARMException::endFunction(const MachineFunction *MF) { F->hasPersonalityFn() && !isNoOpWithoutInvoke(classifyEHPersonality(Per)) && F->needsUnwindTableEntry(); bool shouldEmitPersonality = forceEmitPersonality || - !MF->getLandingPads().empty(); + !MMI->getLandingPads().empty(); if (!Asm->MF->getFunction()->needsUnwindTableEntry() && !shouldEmitPersonality) ATS.emitCantUnwind(); @@ -99,9 +99,8 @@ void ARMException::endFunction(const MachineFunction *MF) { } void ARMException::emitTypeInfos(unsigned TTypeEncoding) { - const MachineFunction *MF = Asm->MF; - const std::vector<const GlobalValue *> &TypeInfos = MF->getTypeInfos(); - const std::vector<unsigned> &FilterIds = MF->getFilterIds(); + const std::vector<const GlobalValue *> &TypeInfos = MMI->getTypeInfos(); + const std::vector<unsigned> &FilterIds = MMI->getFilterIds(); bool VerboseAsm = Asm->OutStreamer->isVerboseAsm(); |
