Move live range check into cleanup_call

Author: Girgias

Zend/zend_execute.c

@@ -3792,9 +3792,27 @@ static zend_always_inline zend_generator *zend_get_running_generator(EXECUTE_DAT
 }
 /* }}} */
 
+/* TODO Can this be done using find_live_range? */
+static bool is_in_silence_live_range(const zend_op_array op_array, uint32_t op_num) {
+	for (int i = 0; i < op_array.last_live_range; i++) {
+		zend_live_range range = op_array.live_range[i];
+		if (op_num >= range.start && op_num < range.end
+				&& (range.var & ZEND_LIVE_MASK) == ZEND_LIVE_SILENCE) {
+			return true;
+		}
+	}
+	return false;
+}
+
 static void cleanup_unfinished_calls(zend_execute_data *execute_data, uint32_t op_num) /* {{{ */
 {
 	if (UNEXPECTED(EX(call))) {
+		/* Do not cleanup unfinished calls for SILENCE live range as it might still get executed
+		 * However, this can only happen if the exception is an instance of Exception
+		 * (Error never gets suppressed) */
+		if (UNEXPECTED(is_in_silence_live_range(EX(func)->op_array, op_num))) {
+			return;
+		}
 		zend_execute_data *call = EX(call);
 		zend_op *opline = EX(func)->op_array.opcodes + op_num;
 		int level;
@@ -3937,18 +3955,6 @@ static const zend_live_range *find_live_range(const zend_op_array *op_array, uin
 }
 /* }}} */
 
-/* TODO Can this be done using find_live_range? */
-static bool is_in_silence_live_range(const zend_op_array op_array, uint32_t op_num) {
-	for (int i = 0; i < op_array.last_live_range; i++) {
-		zend_live_range range = op_array.live_range[i];
-		if (op_num >= range.start && op_num < range.end
-				&& (range.var & ZEND_LIVE_MASK) == ZEND_LIVE_SILENCE) {
-			return true;
-		}
-	}
-	return false;
-}
-
 static void cleanup_live_vars(zend_execute_data *execute_data, uint32_t op_num, uint32_t catch_op_num) /* {{{ */
 {
 	int i;

Zend/zend_vm_def.h

@@ -7865,12 +7865,7 @@ ZEND_VM_HANDLER(149, ZEND_HANDLE_EXCEPTION, ANY, ANY)
 		}
 	}
 
-	/* Do not cleanup unfinished calls for SILENCE live range as it might still get executed
-	 * However, this can only happen if the exception is an instance of Exception
-	 * (Error never gets suppressed) */
-	if (!is_in_silence_live_range(EX(func)->op_array, throw_op_num)) {
-		cleanup_unfinished_calls(execute_data, throw_op_num);
-	}
+	cleanup_unfinished_calls(execute_data, throw_op_num);
 
 	if (throw_op->result_type & (IS_VAR | IS_TMP_VAR)) {
 		switch (throw_op->opcode) {

Zend/zend_vm_execute.h

@@ -3141,12 +3141,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_HANDLE_EXCEPTION_SPEC_HANDLER(
 		}
 	}
 
-	/* Do not cleanup unfinished calls for SILENCE live range as it might still get executed
-	 * However, this can only happen if the exception is an instance of Exception
-	 * (Error never gets suppressed) */
-	if (!is_in_silence_live_range(EX(func)->op_array, throw_op_num)) {
-		cleanup_unfinished_calls(execute_data, throw_op_num);
-	}
+	cleanup_unfinished_calls(execute_data, throw_op_num);
 
 	if (throw_op->result_type & (IS_VAR | IS_TMP_VAR)) {
 		switch (throw_op->opcode) {