Author: hans Date: Mon Aug 27 03:05:36 2018 New Revision: 340731 URL: http://llvm.org/viewvc/llvm-project?rev=340731&view=rev Log: Merging r340641: ------------------------------------------------------------------------ r340641 | stefanp | 2018-08-24 21:38:29 +0200 (Fri, 24 Aug 2018) | 9 lines
[Exception Handling] Unwind tables are required for all functions that have an EH personality. This patch is for defect: https://bugs.llvm.org/show_bug.cgi?id=32611 Functions may require unwind tables even if they are marked with the attribute nounwind. Any function with an EH personality may require an unwind table. Differential Revision: https://reviews.llvm.org/D50987 ------------------------------------------------------------------------ Added: llvm/branches/release_70/test/CodeGen/PowerPC/uwtables.ll - copied unchanged from r340641, llvm/trunk/test/CodeGen/PowerPC/uwtables.ll llvm/branches/release_70/test/CodeGen/X86/uwtables.ll - copied unchanged from r340641, llvm/trunk/test/CodeGen/X86/uwtables.ll Modified: llvm/branches/release_70/ (props changed) llvm/branches/release_70/include/llvm/IR/Function.h llvm/branches/release_70/test/CodeGen/X86/x86-shrink-wrap-unwind.ll Propchange: llvm/branches/release_70/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Aug 27 03:05:36 2018 @@ -1,3 +1,3 @@ /llvm/branches/Apple/Pertwee:110850,110961 /llvm/branches/type-system-rewrite:133420-134817 -/llvm/trunk:155241,338552,338554,338569,338599,338610,338658,338665,338682,338703,338709,338716,338751,338762,338817,338841,338902,338915,338968,339073,339091,339166,339179,339184,339190,339225,339316,339319,339411,339492,339515,339533,339535-339536,339600,339636,339674,339769,339822,339883,339895-339896,339945,340158,340303,340691 +/llvm/trunk:155241,338552,338554,338569,338599,338610,338658,338665,338682,338703,338709,338716,338751,338762,338817,338841,338902,338915,338968,339073,339091,339166,339179,339184,339190,339225,339316,339319,339411,339492,339515,339533,339535-339536,339600,339636,339674,339769,339822,339883,339895-339896,339945,340158,340303,340641,340691 Modified: llvm/branches/release_70/include/llvm/IR/Function.h URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/include/llvm/IR/Function.h?rev=340731&r1=340730&r2=340731&view=diff ============================================================================== --- llvm/branches/release_70/include/llvm/IR/Function.h (original) +++ llvm/branches/release_70/include/llvm/IR/Function.h Mon Aug 27 03:05:36 2018 @@ -557,7 +557,7 @@ public: /// True if this function needs an unwind table. bool needsUnwindTableEntry() const { - return hasUWTable() || !doesNotThrow(); + return hasUWTable() || !doesNotThrow() || hasPersonalityFn(); } /// Determine if the function returns a structure through first Modified: llvm/branches/release_70/test/CodeGen/X86/x86-shrink-wrap-unwind.ll URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/test/CodeGen/X86/x86-shrink-wrap-unwind.ll?rev=340731&r1=340730&r2=340731&view=diff ============================================================================== --- llvm/branches/release_70/test/CodeGen/X86/x86-shrink-wrap-unwind.ll (original) +++ llvm/branches/release_70/test/CodeGen/X86/x86-shrink-wrap-unwind.ll Mon Aug 27 03:05:36 2018 @@ -237,6 +237,7 @@ attributes #5 = { nounwind readonly ssp ; CHECK: push ; ; Jump to throw_exception: +; CHECK-NEXT: .cfi_def_cfa_offset ; CHECK-NEXT: testb $1, %dil ; CHECK-NEXT: jne [[THROW_LABEL:LBB[0-9_]+]] ; Else return exit _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
