ext/opcache/jit/zend_jit_trace: move code to _zend_jit_compile_root_trace()

This eliminates `goto` and simplifies error handling.

Author: MaxKellermann

ext/opcache/jit/zend_jit_trace.c

@@ -7037,13 +7037,93 @@ static const void *zend_jit_trace_exit_to_vm(uint32_t trace_num, uint32_t exit_n
 	return handler;
 }
 
+/**
+ * Helper function for zend_jit_compile_root_trace().
+ */
+static zend_jit_trace_stop _zend_jit_compile_root_trace(zend_jit_trace_rec *const trace_buffer, const zend_op *opline, zend_op_trace_info *const trace_info)
+{
+	zend_jit_trace_exit_info exit_info[ZEND_JIT_TRACE_MAX_EXITS];
+	zend_jit_trace_info *const t = &zend_jit_traces[ZEND_JIT_TRACE_NUM];
+
+	t->id = ZEND_JIT_TRACE_NUM;
+	t->root = ZEND_JIT_TRACE_NUM;
+	t->parent = 0;
+	t->link = 0;
+	t->exit_count = 0;
+	t->child_count = 0;
+	t->stack_map_size = 0;
+	t->flags = 0;
+	t->polymorphism = 0;
+	t->jmp_table_size = 0;
+	t->op_array = trace_buffer[0].op_array;
+	t->opline = trace_buffer[1].opline;
+	t->exit_info = exit_info;
+	t->stack_map = NULL;
+
+	const uint8_t orig_trigger = JIT_G(trigger);
+	JIT_G(trigger) = ZEND_JIT_ON_HOT_TRACE;
+
+	const void *handler = zend_jit_trace(trace_buffer, 0, 0);
+
+	JIT_G(trigger) = orig_trigger;
+
+	if (handler) {
+		t->exit_info = NULL;
+		if (t->exit_count) {
+			/* reallocate exit_info into shared memory */
+			t->exit_info = (zend_jit_trace_exit_info*)zend_shared_alloc_copy(exit_info,
+				sizeof(zend_jit_trace_exit_info) * t->exit_count);
+
+			if (!t->exit_info) {
+				if (t->stack_map) {
+					efree(t->stack_map);
+				}
+				return ZEND_JIT_TRACE_STOP_NO_SHM;
+			}
+		}
+
+		if (t->stack_map_size) {
+			zend_jit_trace_stack *shared_stack_map = (zend_jit_trace_stack*)zend_shared_alloc_copy(
+				t->stack_map,
+				t->stack_map_size * sizeof(zend_jit_trace_stack));
+			efree(t->stack_map);
+			t->stack_map = shared_stack_map;
+			if (!shared_stack_map) {
+				return ZEND_JIT_TRACE_STOP_NO_SHM;
+			}
+		}
+
+		t->exit_counters = ZEND_JIT_EXIT_COUNTERS;
+		ZEND_JIT_EXIT_COUNTERS += t->exit_count;
+
+		((zend_op*)opline)->handler = handler;
+
+		ZEND_JIT_TRACE_NUM++;
+		trace_info->trace_flags |= ZEND_JIT_TRACE_JITED;
+
+		if ((JIT_G(debug) & ZEND_JIT_DEBUG_TRACE_EXIT_INFO) != 0
+		    && t->exit_count > 0) {
+			zend_jit_dump_exit_info(t);
+		}
+
+		return ZEND_JIT_TRACE_STOP_COMPILED;
+	} else if (t->exit_count >= ZEND_JIT_TRACE_MAX_EXITS ||
+		   ZEND_JIT_EXIT_COUNTERS + t->exit_count >= JIT_G(max_exit_counters)) {
+		if (t->stack_map) {
+			efree(t->stack_map);
+		}
+		return ZEND_JIT_TRACE_STOP_TOO_MANY_EXITS;
+	} else {
+		if (t->stack_map) {
+			efree(t->stack_map);
+		}
+		return ZEND_JIT_TRACE_STOP_COMPILER_ERROR;
+	}
+}
+
 static zend_jit_trace_stop zend_jit_compile_root_trace(zend_jit_trace_rec *trace_buffer, const zend_op *opline, size_t offset)
 {
 	zend_jit_trace_stop ret;
-	const void *handler;
-	uint8_t orig_trigger;
-	zend_jit_trace_info *t = NULL;
-	zend_jit_trace_exit_info exit_info[ZEND_JIT_TRACE_MAX_EXITS];
 	bool do_bailout = false;
 
 	zend_shared_alloc_lock();
@@ -7060,81 +7140,7 @@ static zend_jit_trace_stop zend_jit_compile_root_trace(zend_jit_trace_rec *trace
 			SHM_UNPROTECT();
 			zend_jit_unprotect();
 
-			t = &zend_jit_traces[ZEND_JIT_TRACE_NUM];
-
-			t->id = ZEND_JIT_TRACE_NUM;
-			t->root = ZEND_JIT_TRACE_NUM;
-			t->parent = 0;
-			t->link = 0;
-			t->exit_count = 0;
-			t->child_count = 0;
-			t->stack_map_size = 0;
-			t->flags = 0;
-			t->polymorphism = 0;
-			t->jmp_table_size = 0;
-			t->op_array = trace_buffer[0].op_array;
-			t->opline = trace_buffer[1].opline;
-			t->exit_info = exit_info;
-			t->stack_map = NULL;
-
-			orig_trigger = JIT_G(trigger);
-			JIT_G(trigger) = ZEND_JIT_ON_HOT_TRACE;
-
-			handler = zend_jit_trace(trace_buffer, 0, 0);
-
-			JIT_G(trigger) = orig_trigger;
-
-			if (handler) {
-				t->exit_info = NULL;
-				if (t->exit_count) {
-					/* reallocate exit_info into shared memory */
-					t->exit_info = (zend_jit_trace_exit_info*)zend_shared_alloc_copy(exit_info,
-						sizeof(zend_jit_trace_exit_info) * t->exit_count);
-
-					if (!t->exit_info) {
-					    if (t->stack_map) {
-							efree(t->stack_map);
-						}
-						ret = ZEND_JIT_TRACE_STOP_NO_SHM;
-						goto exit;
-					}
-				}
-
-			    if (t->stack_map_size) {
-					zend_jit_trace_stack *shared_stack_map = (zend_jit_trace_stack*)zend_shared_alloc_copy(
-						t->stack_map,
-						t->stack_map_size * sizeof(zend_jit_trace_stack));
-					efree(t->stack_map);
-					t->stack_map = shared_stack_map;
-					if (!shared_stack_map) {
-						ret = ZEND_JIT_TRACE_STOP_NO_SHM;
-						goto exit;
-					}
-			    }
-
-				t->exit_counters = ZEND_JIT_EXIT_COUNTERS;
-				ZEND_JIT_EXIT_COUNTERS += t->exit_count;
-
-				((zend_op*)opline)->handler = handler;
-
-				ZEND_JIT_TRACE_NUM++;
-				trace_info->trace_flags |= ZEND_JIT_TRACE_JITED;
-
-				ret = ZEND_JIT_TRACE_STOP_COMPILED;
-			} else if (t->exit_count >= ZEND_JIT_TRACE_MAX_EXITS ||
-			           ZEND_JIT_EXIT_COUNTERS + t->exit_count >= JIT_G(max_exit_counters)) {
-			    if (t->stack_map) {
-					efree(t->stack_map);
-				}
-				ret = ZEND_JIT_TRACE_STOP_TOO_MANY_EXITS;
-			} else {
-			    if (t->stack_map) {
-					efree(t->stack_map);
-				}
-				ret = ZEND_JIT_TRACE_STOP_COMPILER_ERROR;
-			}
-
-exit:;
+			ret = _zend_jit_compile_root_trace(trace_buffer, opline, trace_info);
 		} zend_catch {
 			do_bailout = true;
 		} zend_end_try();
@@ -7149,12 +7155,6 @@ exit:;
 		zend_bailout();
 	}
 
-	if ((JIT_G(debug) & ZEND_JIT_DEBUG_TRACE_EXIT_INFO) != 0
-	 && ret == ZEND_JIT_TRACE_STOP_COMPILED
-	 && t->exit_count > 0) {
-		zend_jit_dump_exit_info(t);
-	}
-
 	return ret;
 }