Merge pull request #5379 from Feoramund/fix-4711

laytan · web-flow · commit 7d8f41b93837 · 2025-06-20T22:24:08.000+02:00
Push `context` onto stack before evaluating procedure parameters
diff --git a/src/llvm_backend_proc.cpp b/src/llvm_backend_proc.cpp
@@ -546,6 +546,9 @@ gb_internal void lb_begin_procedure_body(lbProcedure *p) {
 	GB_ASSERT(p->type != nullptr);
 
 	lb_ensure_abi_function_type(p->module, p);
+	if (p->type->Proc.calling_convention == ProcCC_Odin) {
+		lb_push_context_onto_stack_from_implicit_parameter(p);
+	}
 	{
 		lbFunctionType *ft = p->abi_function_type;
 
@@ -743,9 +746,6 @@ gb_internal void lb_begin_procedure_body(lbProcedure *p) {
 
 		}
 	}
-	if (p->type->Proc.calling_convention == ProcCC_Odin) {
-		lb_push_context_onto_stack_from_implicit_parameter(p);
-	}
 
 	lb_set_debug_position_to_procedure_begin(p);
 	if (p->debug_info != nullptr) {

Original file line number	Diff line number	Diff line change
`@@ -546,6 +546,9 @@ gb_internal void lb_begin_procedure_body(lbProcedure *p) {`
`546`	`546`	`GB_ASSERT(p->type != nullptr);`
`547`	`547`
`548`	`548`	`lb_ensure_abi_function_type(p->module, p);`
	`549`	`+ if (p->type->Proc.calling_convention == ProcCC_Odin) {`
	`550`	`+ lb_push_context_onto_stack_from_implicit_parameter(p);`
	`551`	`+ }`
`549`	`552`	`{`
`550`	`553`	`lbFunctionType *ft = p->abi_function_type;`
`551`	`554`
`@@ -743,9 +746,6 @@ gb_internal void lb_begin_procedure_body(lbProcedure *p) {`
`743`	`746`
`744`	`747`	`}`
`745`	`748`	`}`
`746`		`- if (p->type->Proc.calling_convention == ProcCC_Odin) {`
`747`		`- lb_push_context_onto_stack_from_implicit_parameter(p);`
`748`		`- }`
`749`	`749`
`750`	`750`	`lb_set_debug_position_to_procedure_begin(p);`
`751`	`751`	`if (p->debug_info != nullptr) {`