[llvm] r340625 - Revert "[Exception Handling] Unwind tables are required for all functions that have an EH personality."

Stefan Pintilie via llvm-commits llvm-commits at lists.llvm.org
Fri Aug 24 10:27:35 PDT 2018


Author: stefanp
Date: Fri Aug 24 10:27:35 2018
New Revision: 340625

URL: http://llvm.org/viewvc/llvm-project?rev=340625&view=rev
Log:
Revert "[Exception Handling] Unwind tables are required for all functions that have an EH personality."

This reverts commit rL340614.
Previous commit broke some llvm-cfi-verify tests.

Removed:
    llvm/trunk/test/CodeGen/PowerPC/uwtables.ll
    llvm/trunk/test/CodeGen/X86/uwtables.ll
Modified:
    llvm/trunk/include/llvm/IR/Function.h
    llvm/trunk/test/CodeGen/X86/x86-shrink-wrap-unwind.ll

Modified: llvm/trunk/include/llvm/IR/Function.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/Function.h?rev=340625&r1=340624&r2=340625&view=diff
==============================================================================
--- llvm/trunk/include/llvm/IR/Function.h (original)
+++ llvm/trunk/include/llvm/IR/Function.h Fri Aug 24 10:27:35 2018
@@ -571,7 +571,7 @@ public:
 
   /// True if this function needs an unwind table.
   bool needsUnwindTableEntry() const {
-    return hasUWTable() || !doesNotThrow() || hasPersonalityFn();
+    return hasUWTable() || !doesNotThrow();
   }
 
   /// Determine if the function returns a structure through first

Removed: llvm/trunk/test/CodeGen/PowerPC/uwtables.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/uwtables.ll?rev=340624&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/uwtables.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/uwtables.ll (removed)
@@ -1,51 +0,0 @@
-; RUN: llc -mcpu=pwr9 -mtriple=powerpc64le-unknown-unknown \
-; RUN:   -verify-machineinstrs -ppc-asm-full-reg-names \
-; RUN:   -ppc-vsr-nums-as-vr < %s | FileCheck %s
-; RUN: llc -mcpu=pwr8 -mtriple=powerpc64le-unknown-unknown \
-; RUN:   -verify-machineinstrs -ppc-asm-full-reg-names \
-; RUN:   -ppc-vsr-nums-as-vr < %s | FileCheck %s
-; RUN: llc -mtriple=powerpc64-unknown-unknown \
-; RUN:   -verify-machineinstrs -ppc-asm-full-reg-names \
-; RUN:   -ppc-vsr-nums-as-vr < %s | FileCheck %s
-
-
- at _ZTIi = external constant i8*
-
-; Function is marked as nounwind but it still throws with __cxa_throw and
-; calls __cxa_call_unexpected.
-; Need to make sure that we do not only have a debug frame.
-; Function Attrs: noreturn nounwind
-define void @_Z4funcv() local_unnamed_addr #0 personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
-entry:
-  %exception = tail call i8* @__cxa_allocate_exception(i64 4)
-  %0 = bitcast i8* %exception to i32*
-  store i32 100, i32* %0, align 16
-  invoke void @__cxa_throw(i8* %exception, i8* bitcast (i8** @_ZTIi to i8*), i8* null)
-          to label %unreachable unwind label %lpad
-
-lpad:                                             ; preds = %entry
-  %1 = landingpad { i8*, i32 }
-          filter [0 x i8*] zeroinitializer
-  %2 = extractvalue { i8*, i32 } %1, 0
-  tail call void @__cxa_call_unexpected(i8* %2)
-  unreachable
-
-unreachable:                                      ; preds = %entry
-  unreachable
-; CHECK-LABEL: _Z4funcv
-; CHECK-NOT: .debug_frame
-; CHECK: .cfi_personality
-; CHECK: .cfi_endproc
-}
-
-declare i8* @__cxa_allocate_exception(i64) local_unnamed_addr
-
-declare void @__cxa_throw(i8*, i8*, i8*) local_unnamed_addr
-
-declare i32 @__gxx_personality_v0(...)
-
-declare void @__cxa_call_unexpected(i8*) local_unnamed_addr
-
-
-attributes #0 = { noreturn nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="false" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="ppc64le" "target-features"="+altivec,+bpermd,+crypto,+direct-move,+extdiv,+htm,+power8-vector,+vsx,-power9-vector,-qpx" "unsafe-fp-math"="false" "use-soft-float"="false" }
-

Removed: llvm/trunk/test/CodeGen/X86/uwtables.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/uwtables.ll?rev=340624&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/X86/uwtables.ll (original)
+++ llvm/trunk/test/CodeGen/X86/uwtables.ll (removed)
@@ -1,43 +0,0 @@
-; RUN: llc -mtriple=x86_64-unknown-linux-gnu < %s | FileCheck %s
-
-
- at _ZTIi = external constant i8*
-
-; Function is marked as nounwind but it still throws with __cxa_throw and
-; calls __cxa_call_unexpected.
-; Need to make sure that we do not only have a debug frame.
-; Function Attrs: noreturn nounwind
-define void @_Z4funcv() local_unnamed_addr #0 personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
-entry:
-  %exception = tail call i8* @__cxa_allocate_exception(i64 4)
-  %0 = bitcast i8* %exception to i32*
-  store i32 100, i32* %0, align 16
-  invoke void @__cxa_throw(i8* %exception, i8* bitcast (i8** @_ZTIi to i8*), i8* null)
-          to label %unreachable unwind label %lpad
-
-lpad:                                             ; preds = %entry
-  %1 = landingpad { i8*, i32 }
-          filter [0 x i8*] zeroinitializer
-  %2 = extractvalue { i8*, i32 } %1, 0
-  tail call void @__cxa_call_unexpected(i8* %2)
-  unreachable
-
-unreachable:                                      ; preds = %entry
-  unreachable
-; CHECK-LABEL: _Z4funcv
-; CHECK-NOT: .debug_frame
-; CHECK: .cfi_personality
-; CHECK: .cfi_endproc
-}
-
-declare i8* @__cxa_allocate_exception(i64) local_unnamed_addr
-
-declare void @__cxa_throw(i8*, i8*, i8*) local_unnamed_addr
-
-declare i32 @__gxx_personality_v0(...)
-
-declare void @__cxa_call_unexpected(i8*) local_unnamed_addr
-
-
-attributes #0 = { noreturn nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="false" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="ppc64le" "target-features"="+altivec,+bpermd,+crypto,+direct-move,+extdiv,+htm,+power8-vector,+vsx,-power9-vector,-qpx" "unsafe-fp-math"="false" "use-soft-float"="false" }
-

Modified: llvm/trunk/test/CodeGen/X86/x86-shrink-wrap-unwind.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/x86-shrink-wrap-unwind.ll?rev=340625&r1=340624&r2=340625&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/x86-shrink-wrap-unwind.ll (original)
+++ llvm/trunk/test/CodeGen/X86/x86-shrink-wrap-unwind.ll Fri Aug 24 10:27:35 2018
@@ -237,7 +237,6 @@ 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




More information about the llvm-commits mailing list