From e5aa0e43163b9090bac56adb0f298c397083c5ac Mon Sep 17 00:00:00 2001 From: florian Date: Sat, 8 Feb 2014 16:43:23 +0000 Subject: [PATCH] * set pi_uses_exceptions flag only if the try...finally frame is not an implicit frame git-svn-id: trunk@26731 - --- compiler/nflw.pas | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/compiler/nflw.pas b/compiler/nflw.pas index a76b5cf19d..e1c38bf6a2 100644 --- a/compiler/nflw.pas +++ b/compiler/nflw.pas @@ -2130,7 +2130,13 @@ implementation firstpass(t1); include(current_procinfo.flags,pi_do_call); - include(current_procinfo.flags,pi_uses_exceptions); + + { pi_uses_exceptions is an information for the optimizer and it + is only interested in exceptions if they appear inside the body, + so ignore implicit frames when setting the flag } + if not(implicitframe) then + include(current_procinfo.flags,pi_uses_exceptions); + inc(current_procinfo.estimatedtempsize,get_jumpbuf_size); end;