diff options
| author | Reid Kleckner <rnk@google.com> | 2017-03-20 17:45:59 +0000 |
|---|---|---|
| committer | Reid Kleckner <rnk@google.com> | 2017-03-20 17:45:59 +0000 |
| commit | 8819c7387821de31caa09c94094db1f1a906ca4d (patch) | |
| tree | 3cbecac88f61ce7a250dd2ff7bbf018871fd2490 /llvm/lib/CodeGen | |
| parent | 335777b79bd2b49f600ea8d713d77ea4ba80a7e4 (diff) | |
| download | bcm5719-llvm-8819c7387821de31caa09c94094db1f1a906ca4d.tar.gz bcm5719-llvm-8819c7387821de31caa09c94094db1f1a906ca4d.zip | |
[WinEH] Adjust decision to emit SEH moves for leaf functions
Move the check for "MF->hasWinCFI()" up into the calculation of the
shouldEmitMoves boolean, rather than putting it in the early returning
if. This ensures that endFunction doesn't try to emit .seh_* directives
for leaf functions.
llvm-svn: 298276
Diffstat (limited to 'llvm/lib/CodeGen')
| -rw-r--r-- | llvm/lib/CodeGen/AsmPrinter/WinException.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/CodeGen/AsmPrinter/WinException.cpp b/llvm/lib/CodeGen/AsmPrinter/WinException.cpp index 9d7c96a1b8e..704f0ac2f19 100644 --- a/llvm/lib/CodeGen/AsmPrinter/WinException.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/WinException.cpp @@ -68,7 +68,7 @@ void WinException::beginFunction(const MachineFunction *MF) { const Function *F = MF->getFunction(); - shouldEmitMoves = Asm->needsSEHMoves(); + shouldEmitMoves = Asm->needsSEHMoves() && MF->hasWinCFI(); const TargetLoweringObjectFile &TLOF = Asm->getObjFileLowering(); unsigned PerEncoding = TLOF.getPersonalityEncoding(); @@ -94,7 +94,7 @@ void WinException::beginFunction(const MachineFunction *MF) { // If we're not using CFI, we don't want the CFI or the personality, but we // might want EH tables if we had EH pads. - if (!Asm->MAI->usesWindowsCFI() || (!MF->hasWinCFI() && !PerFn)) { + if (!Asm->MAI->usesWindowsCFI()) { if (Per == EHPersonality::MSVC_X86SEH && !hasEHFunclets) { // If this is 32-bit SEH and we don't have any funclets (really invokes), // make sure we emit the parent offset label. Some unreferenced filter |
