From 807e6ebb5443cb61ce99a12dda15cc1ec9ba7201 Mon Sep 17 00:00:00 2001 From: Jason Hiser <jdhiser@gmail.com> Date: Sat, 1 Jun 2019 18:56:13 -0400 Subject: [PATCH] unpin landing pads and personality routines from exception handling tables when adding EHIR to IRDB --- irdb-libs/ir_builders/fill_in_indtargs.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/irdb-libs/ir_builders/fill_in_indtargs.cpp b/irdb-libs/ir_builders/fill_in_indtargs.cpp index 03fa1cab1..93d0b963d 100644 --- a/irdb-libs/ir_builders/fill_in_indtargs.cpp +++ b/irdb-libs/ir_builders/fill_in_indtargs.cpp @@ -4010,9 +4010,12 @@ void fill_in_indtargs(FileIR_t* firp, exeio* exeiop, int64_t do_unpin_opt) /* mark the entry point as a target */ possible_target(exeiop->get_entry(),0,ibt_provenance_t::ibtp_entrypoint); - /* Read the exception handler frame so that those indirect branches are accounted for */ - /* then now process the ranges and mark IBTs as necessarthat have exception handling */ - read_ehframe(firp, exeiop); + /* Read the exception handler frame so that those indirect branches are accounted for + * then now process the ranges and mark IBTs as necessarthat have exception handling. + * But skip it if we are going to read the EH info into the IR. + */ + if(!split_eh_frame_opt) + read_ehframe(firp, exeiop); process_ranges(firp); /* now, find the .GOT addr and process any pc-rel things for x86-32 ibts. */ -- GitLab