[llvm-commits] [llvm] r144049 - in /llvm/trunk/test/CodeGen/X86: 2007-05-05-Personality.ll 2010-04-30-LocalAlloc-LandingPad.ll 2010-08-04-MingWCrash.ll
Bill Wendling
isanbard at gmail.com
Mon Nov 7 16:17:28 PST 2011
Author: void
Date: Mon Nov 7 18:17:28 2011
New Revision: 144049
URL: http://llvm.org/viewvc/llvm-project?rev=144049&view=rev
Log:
Convert to the new EH model.
Modified:
llvm/trunk/test/CodeGen/X86/2007-05-05-Personality.ll
llvm/trunk/test/CodeGen/X86/2010-04-30-LocalAlloc-LandingPad.ll
llvm/trunk/test/CodeGen/X86/2010-08-04-MingWCrash.ll
Modified: llvm/trunk/test/CodeGen/X86/2007-05-05-Personality.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2007-05-05-Personality.ll?rev=144049&r1=144048&r2=144049&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/2007-05-05-Personality.ll (original)
+++ llvm/trunk/test/CodeGen/X86/2007-05-05-Personality.ll Mon Nov 7 18:17:28 2011
@@ -10,9 +10,10 @@
invoke void @raise()
to label %eh_then unwind label %unwind
-unwind: ; preds = %entry
- %eh_ptr = tail call i8* @llvm.eh.exception()
- %eh_select = tail call i32 (i8*, i8*, ...)* @llvm.eh.selector(i8* %eh_ptr, i8* bitcast (i32 (...)* @__gnat_eh_personality to i8*), i8* @error)
+unwind: ; preds = %entry
+ %eh_ptr = landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @__gnat_eh_personality to i8*)
+ catch i8* @error
+ %eh_select = extractvalue { i8*, i32 } %eh_ptr, 1
%eh_typeid = tail call i32 @llvm.eh.typeid.for(i8* @error)
%tmp2 = icmp eq i32 %eh_select, %eh_typeid
br i1 %tmp2, label %eh_then, label %Unwind
@@ -21,16 +22,11 @@
ret void
Unwind: ; preds = %unwind
- %0 = tail call i32 (...)* @_Unwind_Resume(i8* %eh_ptr)
- unreachable
+ resume { i8*, i32 } %eh_ptr
}
declare void @raise()
-declare i8* @llvm.eh.exception() nounwind readonly
-
-declare i32 @llvm.eh.selector(i8*, i8*, ...) nounwind
-
declare i32 @llvm.eh.typeid.for(i8*) nounwind
declare i32 @__gnat_eh_personality(...)
Modified: llvm/trunk/test/CodeGen/X86/2010-04-30-LocalAlloc-LandingPad.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2010-04-30-LocalAlloc-LandingPad.ll?rev=144049&r1=144048&r2=144049&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/2010-04-30-LocalAlloc-LandingPad.ll (original)
+++ llvm/trunk/test/CodeGen/X86/2010-04-30-LocalAlloc-LandingPad.ll Mon Nov 7 18:17:28 2011
@@ -30,14 +30,16 @@
br label %finally
terminate.handler: ; preds = %match.end
- %exc = call i8* @llvm.eh.exception() ; <i8*> [#uses=1]
- %1 = call i32 (i8*, i8*, ...)* @llvm.eh.selector(i8* %exc, i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*), i32 1) ; <i32> [#uses=0]
+ %1 = landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*)
+ cleanup
call void @_ZSt9terminatev() noreturn nounwind
unreachable
try.handler: ; preds = %entry
- %exc1 = call i8* @llvm.eh.exception() ; <i8*> [#uses=3]
- %selector = call i32 (i8*, i8*, ...)* @llvm.eh.selector(i8* %exc1, i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*), i8* bitcast (i8** @_ZTIi to i8*), i8* null) ; <i32> [#uses=1]
+ %exc1.ptr = landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*)
+ catch i8* null
+ %exc1 = extractvalue { i8*, i32 } %exc1.ptr, 0
+ %selector = extractvalue { i8*, i32 } %exc1.ptr, 1
%2 = call i32 @llvm.eh.typeid.for(i8* bitcast (i8** @_ZTIi to i8*)) ; <i32> [#uses=1]
%3 = icmp eq i32 %selector, %2 ; <i1> [#uses=1]
br i1 %3, label %match, label %catch.next
@@ -55,9 +57,10 @@
br label %match.end
match.handler: ; preds = %match
- %exc3 = call i8* @llvm.eh.exception() ; <i8*> [#uses=2]
- %7 = call i32 (i8*, i8*, ...)* @llvm.eh.selector(i8* %exc3, i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*), i32 0) ; <i32> [#uses=0]
- store i8* %exc3, i8** %_rethrow
+ %exc3 = landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*)
+ cleanup
+ %7 = extractvalue { i8*, i32 } %exc3, 0
+ store i8* %7, i8** %_rethrow
store i32 2, i32* %cleanup.dst
br label %match.end
@@ -124,10 +127,6 @@
declare i32 @__gxx_personality_v0(...)
-declare i8* @llvm.eh.exception() nounwind readonly
-
-declare i32 @llvm.eh.selector(i8*, i8*, ...) nounwind
-
declare void @_ZSt9terminatev()
declare void @_Unwind_Resume_or_Rethrow(i8*)
Modified: llvm/trunk/test/CodeGen/X86/2010-08-04-MingWCrash.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2010-08-04-MingWCrash.ll?rev=144049&r1=144048&r2=144049&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/2010-08-04-MingWCrash.ll (original)
+++ llvm/trunk/test/CodeGen/X86/2010-08-04-MingWCrash.ll Mon Nov 7 18:17:28 2011
@@ -10,14 +10,15 @@
ret void
lpad:
- %exn = tail call i8* @llvm.eh.exception() nounwind
- %eh.selector = tail call i32 (i8*, i8*, ...)* @llvm.eh.selector(i8* %exn, i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*), i32 1, i8* null) nounwind
+ %exn.ptr = landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*)
+ catch i8* null
+ %exn = extractvalue { i8*, i32 } %exn.ptr, 0
+ %eh.selector = extractvalue { i8*, i32 } %exn.ptr, 1
%ehspec.fails = icmp slt i32 %eh.selector, 0
br i1 %ehspec.fails, label %ehspec.unexpected, label %cleanup
cleanup:
- tail call void @_Unwind_Resume_or_Rethrow(i8* %exn) noreturn nounwind
- unreachable
+ resume { i8*, i32 } %exn.ptr
ehspec.unexpected:
tail call void @__cxa_call_unexpected(i8* %exn) noreturn nounwind
@@ -26,12 +27,8 @@
declare noalias i8* @malloc()
-declare i8* @llvm.eh.exception() nounwind readonly
-
declare i32 @__gxx_personality_v0(...)
-declare i32 @llvm.eh.selector(i8*, i8*, ...) nounwind
-
declare void @_Unwind_Resume_or_Rethrow(i8*)
declare void @__cxa_call_unexpected(i8*)
More information about the llvm-commits
mailing list