summaryrefslogtreecommitdiff
path: root/lib/CodeGen/AsmPrinter/WinException.cpp
diff options
context:
space:
mode:
authorTom Stellard <thomas.stellard@amd.com>2015-11-21 01:08:13 +0000
committerTom Stellard <thomas.stellard@amd.com>2015-11-21 01:08:13 +0000
commit33c352b3eda89abc24e7511d9045fa2e499a42e3 (patch)
tree7bd6db5b620f10e2d846176f12468061bcf46869 /lib/CodeGen/AsmPrinter/WinException.cpp
parent3f4c496a9449877189c27c537c0c7699610d6ddb (diff)
downloadllvm-release_37.tar.gz
Merging r247435:release_37
------------------------------------------------------------------------ r247435 | david.majnemer | 2015-09-11 13:34:34 -0400 (Fri, 11 Sep 2015) | 8 lines [X86] Make sure startproc/endproc are paired We used different conditions to determine if we should emit startproc vs endproc. Use the same condition to ensure that they will always be paired. This fixes PR24374. ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_37@253742 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/AsmPrinter/WinException.cpp')
-rw-r--r--lib/CodeGen/AsmPrinter/WinException.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/CodeGen/AsmPrinter/WinException.cpp b/lib/CodeGen/AsmPrinter/WinException.cpp
index 71c77815e281..a2b9316aa875 100644
--- a/lib/CodeGen/AsmPrinter/WinException.cpp
+++ b/lib/CodeGen/AsmPrinter/WinException.cpp
@@ -169,7 +169,7 @@ void WinException::endFunction(const MachineFunction *MF) {
Asm->OutStreamer->PopSection();
}
- if (shouldEmitMoves)
+ if (shouldEmitMoves || shouldEmitPersonality)
Asm->OutStreamer->EmitWinCFIEndProc();
}