From 4bc0e49878e4c7fa0244fa2c5d8add72dedb427f Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Sun, 28 Oct 2018 19:54:04 +0000 Subject: [PATCH] - removed unused FPC_psabieh_can_catch() * added missing exit in FPC_psabieh_find_action_record * fixed type error in call to _Unwind_SetGR() (caught by compiler fix for that intrinsic) git-svn-id: branches/debug_eh@40073 - --- rtl/inc/psabieh.inc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/rtl/inc/psabieh.inc b/rtl/inc/psabieh.inc index 2081dfa69b..f23a65ffd8 100644 --- a/rtl/inc/psabieh.inc +++ b/rtl/inc/psabieh.inc @@ -331,11 +331,6 @@ function FPC_psabieh_get_ttype_entry(const info: FPC_psabieh_lsda_header_info; i result:=TClass(ptr); end; -function FPC_psabieh_can_catch(catch_type: TClass; thrown: TObject): boolean; - begin - result:=thrown is catch_type - end; - // Return true if THROW_TYPE matches one if the filter types. function FPC_psabieh_check_exception_spec(const info: FPC_psabieh_lsda_header_info; thrown: TObject; filter_value: PtrInt): boolean; var @@ -410,6 +405,7 @@ function FPC_psabieh_find_action_record(const info: FPC_psabieh_lsda_header_info if cs_action<>0 then action_record:=info.action_table+cs_action-1; result:=true; + exit; end; end; end; @@ -652,7 +648,7 @@ function FPC_psabieh_personality_v0(version: cint; actions: FPC_Unwind_Action; e {$if sizeof(pointer)<>sizeof(SizeInt)} {$error Add support for extending pointer values} {$endif} - _Unwind_SetGR(context,fpc_eh_return_data_regno(0),libunwind_exception); + _Unwind_SetGR(context,fpc_eh_return_data_regno(0),PtrUInt(libunwind_exception)); _Unwind_SetGR (context,fpc_eh_return_data_regno(1),handler_switch_value); _Unwind_SetIP(context,landing_pad); result:=FPC_URC_INSTALL_CONTEXT;