[Save] Generate exception handler in tree

Author: emilienlemaire

cobc/ChangeLog

@@ -1,4 +1,4 @@
-2025-10-07  Emilien Lemaire <[email protected]>
+2025-11-10  Emilien Lemaire <[email protected]>
 
 	* codegen.c (output_size_exception_handler): generate a check for a
 	size exception on statements that can raise them

cobc/codegen.c

@@ -9033,7 +9033,7 @@ output_assign (const struct cb_assign *ap)
 #endif	/* Nonaligned */
 }
 
-static void
+/* static void
 output_size_exception_handler(const struct cb_statement *p) {
 	unsigned i;
 	const int enabled_size_ec[8] = {
@@ -9086,7 +9086,7 @@ output_size_exception_handler(const struct cb_statement *p) {
 		default:
 			break;
 	}
-}
+} */
 
 static void
 output_stmt (cb_tree x)
@@ -9206,9 +9206,9 @@ output_stmt (cb_tree x)
 			}
 		}
 
-		if ((!p->ex_handler || (p->ex_handler && p->handler_type != SIZE_ERROR_HANDLER))) {
+		/* if ((!p->ex_handler || (p->ex_handler && p->handler_type != SIZE_ERROR_HANDLER))) {
 			output_size_exception_handler(p);
-		}
+		} */
 
 		break;
 	}

cobc/parser.y

@@ -18134,13 +18134,25 @@ on_size_error_phrases:
   %prec SHIFT_PREFER
   {
 	/* no [NOT] ON SIZE ERROR is specified (= no explicit handling) */
+	if (CB_EXCEPTION_ENABLE(EC-SIZE)) {
+		current_statement->handler_type = SIZE_ERROR_HANDLER;
+		current_statement->ex_handler = cb_build_direct("cob_call_size_error ();", 1);
+	}
   }
 | on_size_error _not_on_size_error
 | not_on_size_error _on_size_error
   {
 	if ($2) {
 		cb_verify (cb_not_exception_before_exception,
 			_("NOT SIZE ERROR before SIZE ERROR"));
+	} else if ($1 && $1 != cb_int1) {
+		/* One NOT ON SIZE ERROR, but no ON SIZE ERROR, so we need to
+		   check on exceptions */
+		if (CB_EXCEPTION_ENABLE(EC-SIZE)) {
+			current_statement->handler_type = SIZE_ERROR_HANDLER;
+				current_statement->ex_handler =
+				cb_build_direct("cob_call_size_error ();", 1);
+		}
 	}
   }
 ;
@@ -18176,6 +18188,7 @@ _not_on_size_error:
 not_on_size_error:
   NOT_SIZE_ERROR statement_list
   {
+	$$ = cb_int2;
 	current_statement->handler_type = SIZE_ERROR_HANDLER;
 	if (is_valid_statement_tree ($2)) {
 		current_statement->not_ex_handler = $2;

libcob/call.c

@@ -19,6 +19,7 @@
 */
 
 
+#include "common.h"
 #include "config.h"
 
 #ifndef	_GNU_SOURCE
@@ -1044,6 +1045,17 @@ cob_call_error (void)
 	cob_hard_failure ();
 }
 
+void
+cob_call_size_error (void) {
+	int last_exception_code;
+	last_exception_code = cob_get_global_ptr()->cob_exception_code;
+	if (last_exception_code) {
+		cob_runtime_error("Fatal size exception not handled: %s",
+			cob_get_last_exception_name());
+		cob_hard_failure ();
+	}
+}
+
 void
 cob_set_cancel (cob_module *m)
 {

libcob/common.h

@@ -2085,6 +2085,7 @@ COB_EXPIMP cob_s64_t	cob_s64_pow (cob_s64_t, cob_s64_t);
 /* Functions in call.c */
 
 DECLNORET COB_EXPIMP void	cob_call_error		(void) COB_A_NORETURN;
+DECLNORET COB_EXPIMP void	cob_call_size_error	(void) COB_A_NORETURN;
 COB_EXPIMP void		cob_field_constant (cob_field *f, cob_field *t, cob_field_attr *a, void *d);
 
 COB_EXPIMP void		cob_set_cancel		(cob_module *);

tests/ChangeLog

@@ -1,11 +1,14 @@
 
-2025-11-10  Emilien Lemaire <[email protected]>
+2025-10-30  Simon Sobisch <[email protected]>
 
-	* testsuite.src/data_binary.at, testsuite.src/data_display.at,
-	testsuite.src/data_packed.at, testsuite.src/run_extenstions.at,
-	testsuite.src/run_fundamental.at testsuite.src/run_misc.at: add a
-	`-fno-ec=EC-SIZE` on tests that rely on a non standard exception
-	handling
+	* atlocal.in (perf_stat, perf_record): moved calling of perf out to a
+	  function and added a second call for recording
+	* atlocal.in, atlocal_win: fixed quoting (2025-09-17 change)
+
+2025-09-17  Simon Sobisch <[email protected]>
+
+	* atlocal.in, atlocal_win: quote local include and library directories
+	  to support the rare scenario of space-embedded paths, fixing #1142
 
 2025-05-22  David Declerck <[email protected]>