From 570c7b5745abc658ef39c0d5caf10da748cd69a4 Mon Sep 17 00:00:00 2001
From: Afonso Bordado <afonsobordado@az8.co>
Date: Wed, 28 Jun 2023 17:53:36 +0100
Subject: [PATCH] cranelift: Support calling functions with `vmctx` arguments

This is a leftover from #3302 where we used to inject a special `vmctx`
struct if the test requested it. We've removed that capability in #5386
but accidentally left this in, which caused some weird handling of these
test invocations.
---
 .../filetests/runtests/global_value.clif      | 54 +++++++++++++++++++
 cranelift/reader/src/parser.rs                | 12 +----
 2 files changed, 55 insertions(+), 11 deletions(-)
 create mode 100644 cranelift/filetests/filetests/runtests/global_value.clif

diff --git a/cranelift/filetests/filetests/runtests/global_value.clif b/cranelift/filetests/filetests/runtests/global_value.clif
new file mode 100644
index 000000000000..7cc525d8595b
--- /dev/null
+++ b/cranelift/filetests/filetests/runtests/global_value.clif
@@ -0,0 +1,54 @@
+test interpret
+test run
+target x86_64
+target s390x
+target aarch64
+target riscv64
+
+
+
+function %simple(i64 vmctx) -> i64 {
+    gv0 = vmctx
+
+block0(v0: i64):
+    v1 = global_value.i64 gv0
+    return v1
+}
+; run: %simple(0) == 0
+; run: %simple(10) == 10
+
+
+
+
+;; This test sets up a more complex scenario. We build a vmctx struct
+;; and use it to call a function that loads from it.
+
+function %vm_state() -> i64 {
+    fn0 = %load_at_0_and_add(i64 vmctx) -> i64
+
+    ;; This is our vmctx struct
+    ss1 = explicit_slot 8
+
+block0:
+    ;; Store a 1 in the vmctx struct
+    v1 = iconst.i64 1
+    stack_store.i64 v1, ss1
+
+    ;; Call %load_at_0_and_add with vmctx
+    v2 = stack_addr.i64 ss1
+    v3 = call fn0(v2)
+
+    return v3
+}
+; run: %vm_state() == 2
+
+
+function %load_at_0_and_add(i64 vmctx) -> i64 {
+    gv0 = vmctx
+    gv1 = load.i64 notrap aligned gv0+0
+
+block0(v0: i64):
+    v1 = global_value.i64 gv1
+    v2 = iadd_imm.i64 v1, 1
+    return v2
+}
diff --git a/cranelift/reader/src/parser.rs b/cranelift/reader/src/parser.rs
index 83be39a33c2f..ab6318748c90 100644
--- a/cranelift/reader/src/parser.rs
+++ b/cranelift/reader/src/parser.rs
@@ -2350,17 +2350,7 @@ impl<'a> Parser<'a> {
             let arg_types = sig
                 .params
                 .iter()
-                .enumerate()
-                .filter_map(|(i, p)| {
-                    // The first argument being VMCtx indicates that this is a argument that is going
-                    // to be passed in with info about the test environment, and should not be passed
-                    // in the run params.
-                    if p.purpose == ir::ArgumentPurpose::VMContext && i == 0 {
-                        None
-                    } else {
-                        Some(p.value_type)
-                    }
-                })
+                .map(|abi| abi.value_type)
                 .collect::<Vec<_>>();
             let args = self.parse_data_value_list(&arg_types)?;