[llvm] r298276 - [WinEH] Adjust decision to emit SEH moves for leaf functions

Reid Kleckner via llvm-commits llvm-commits at lists.llvm.org
Mon Mar 20 10:46:00 PDT 2017


Author: rnk
Date: Mon Mar 20 12:45:59 2017
New Revision: 298276

URL: http://llvm.org/viewvc/llvm-project?rev=298276&view=rev
Log:
[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.

Added:
    llvm/trunk/test/CodeGen/X86/win64_eh_leaf2.ll
Modified:
    llvm/trunk/lib/CodeGen/AsmPrinter/WinException.cpp

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/WinException.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/WinException.cpp?rev=298276&r1=298275&r2=298276&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/WinException.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/WinException.cpp Mon Mar 20 12:45:59 2017
@@ -68,7 +68,7 @@ void WinException::beginFunction(const M
 
   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 M
 
   // 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

Added: llvm/trunk/test/CodeGen/X86/win64_eh_leaf2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/win64_eh_leaf2.ll?rev=298276&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/X86/win64_eh_leaf2.ll (added)
+++ llvm/trunk/test/CodeGen/X86/win64_eh_leaf2.ll Mon Mar 20 12:45:59 2017
@@ -0,0 +1,22 @@
+; RUN: llc < %s -O1 -mtriple=x86_64-pc-win32 | FileCheck %s
+
+; Neither of these functions need .seh_ directives. We used to crash.
+
+target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-pc-windows-msvc"
+
+declare i32 @__CxxFrameHandler3(...)
+
+define void @f1() uwtable nounwind personality i32 (...)* @__CxxFrameHandler3 {
+  ret void
+}
+
+; CHECK-LABEL: f1:
+; CHECK-NOT: .seh_
+
+define void @f2() uwtable {
+  ret void
+}
+
+; CHECK-LABEL: f2:
+; CHECK-NOT: .seh_




More information about the llvm-commits mailing list