From a6e06417785288f66c990e828cccbf9fb9836ba7 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jo@mein.io>
Date: Fri, 29 Nov 2024 14:00:09 +0100
Subject: [PATCH] vm: resolve upvalues before pushing them onto the stack

Commit e5fe6b1 ("treewide: refactor vector usage code") accidentially dropped
the upvalue resolving logic from uc_vm_stack_push(), leading to unresolved
upvalues leaking into the script execution context.

Fixes: e5fe6b1 ("treewide: refactor vector usage code")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---
 .../99_bugs/50_missing_upvalue_resolving      | 27 +++++++++++++++++++
 vm.c                                          |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 tests/custom/99_bugs/50_missing_upvalue_resolving

diff --git a/tests/custom/99_bugs/50_missing_upvalue_resolving b/tests/custom/99_bugs/50_missing_upvalue_resolving
new file mode 100644
index 00000000..5e96634b
--- /dev/null
+++ b/tests/custom/99_bugs/50_missing_upvalue_resolving
@@ -0,0 +1,27 @@
+Commit e5fe6b1 ("treewide: refactor vector usage code") accidentially dropped
+the upvalue resolving logic from uc_vm_stack_push(), leading to unresolved
+upvalues leaking into the script execution context.
+
+-- File test.uc --
+export let obj = { foo: true, bar: false };
+-- End --
+
+-- Testcase --
+import * as test from "./files/test.uc";
+
+printf("%.J\n", [
+	type(test.obj),
+	test.obj.foo
+]);
+-- End --
+
+-- Args --
+-R
+-- End --
+
+-- Expect stdout --
+[
+	"object",
+	true
+]
+-- End --
diff --git a/vm.c b/vm.c
index 3dd054b3..9488288a 100644
--- a/vm.c
+++ b/vm.c
@@ -431,7 +431,7 @@ uc_vm_resolve_upval(uc_vm_t *vm, uc_value_t *value)
 void
 uc_vm_stack_push(uc_vm_t *vm, uc_value_t *value)
 {
-	uc_vector_push(&vm->stack, value);
+	uc_vector_push(&vm->stack, uc_vm_resolve_upval(vm, value));
 
 	if (vm->trace) {
 		fprintf(stderr, "  [+%zd] %s\n",