From 022ca310506bade09f33e68f0080d641634bdd49 Mon Sep 17 00:00:00 2001 From: agra Date: Wed, 20 May 2026 10:54:37 +0300 Subject: [PATCH] ffi 2.16b green: lexical-direct env in `#jni_call` inside `#jni_env` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `Lowering` gains a `jni_env_stack: ArrayList(Ref)`. When lowering the `jni_env_block` arm pushes the env_expr's Ref before lowering the body and pops after; `defer` ensures cleanup on early return. `lowerJniCall` now disambiguates explicit-vs-omitted env via the position of the first string-literal arg: at index 1 → omitted (3-arg form `target, "name", "sig"`), at index 2 → explicit (4-arg form `env, target, "name", "sig"`). Omitted form reads the top of `jni_env_stack`; missing scope → diagnostic. End-to-end test runs cleanly. Locked-in IR snapshot at `tests/expected/ffi-jni-env-02-lexical-direct.ir` shows env coming from the enclosing fn's `*void` param straight into the jni_msg_send expansion — no extra load, no thread-local read. The hot-path optimisation from the design discussion is now real. 128/128 examples + 1 new IR snapshot green; zig test clean. --- src/ir/lower.zig | 48 ++- .../ffi-jni-env-02-lexical-direct.exit | 2 +- .../expected/ffi-jni-env-02-lexical-direct.ir | 291 ++++++++++++++++++ .../ffi-jni-env-02-lexical-direct.txt | 2 +- 4 files changed, 330 insertions(+), 13 deletions(-) create mode 100644 tests/expected/ffi-jni-env-02-lexical-direct.ir diff --git a/src/ir/lower.zig b/src/ir/lower.zig index b2db0e0..938c682 100644 --- a/src/ir/lower.zig +++ b/src/ir/lower.zig @@ -96,6 +96,7 @@ pub const Lowering = struct { import_graph: ?*std.StringHashMap(std.StringHashMap(void)) = null, // module path → set of directly imported paths (used by param_impl_map visibility filter) current_source_file: ?[]const u8 = null, // source file of function currently being lowered sel_register_name_fid: ?FuncId = null, // lazily-declared `sel_registerName` extern (non-literal selector fallback) + jni_env_stack: std.ArrayList(Ref) = std.ArrayList(Ref).empty, // lexical `#jni_env(env)` Ref stack — top is current scope's env for omitted-env `#jni_call` type_bindings: ?std.StringHashMap(TypeId) = null, // generic type param bindings ($T → concrete TypeId) current_match_tags: ?[]const u64 = null, // type tags for current match arm (for runtime dispatch) force_block_value: bool = false, // set by lowerBlockValue to extract if-else values @@ -1051,10 +1052,14 @@ pub const Lowering = struct { .insert_expr => |ins| self.lowerInsertExpr(ins.expr), .block => self.lowerBlock(node), .jni_env_block => |eb| { - // 2.16a: evaluate env for side effects, lower body as a normal block. - // TL push/pop semantics land in 2.16b; until then `#jni_env` is a - // syntactic marker that doesn't affect codegen. - _ = self.lowerExpr(eb.env); + // Lexical-direct env resolution (2.16b): evaluate env once, + // push onto the env stack, lower body, pop. `#jni_call` + // sites inside `eb.body` with an omitted env arg pick up + // the top-of-stack value directly — no thread-local read, + // env stays register-resident across the body. + const env_ref = self.lowerExpr(eb.env); + self.jni_env_stack.append(self.alloc, env_ref) catch unreachable; + defer _ = self.jni_env_stack.pop(); self.lowerBlock(eb.body); }, // Block-local type declarations @@ -3860,18 +3865,39 @@ pub const Lowering = struct { } fn lowerJniCall(self: *Lowering, fic: *const ast.FfiIntrinsicCall) Ref { - if (fic.args.len < 4) { + // env disambiguation: the method-name slot is always a string literal, + // so its position tells us whether env was omitted. + // omitted → args = target, "name", "sig", method-args... (≥3) + // explicit → args = env, target, "name", "sig", method-args... (≥4) + const env_omitted = fic.args.len >= 3 and fic.args[1].data == .string_literal; + const min_arity: usize = if (env_omitted) 3 else 4; + if (fic.args.len < min_arity) { if (self.diagnostics) |d| { - d.add(.err, "#jni_call requires env, target, method name, and signature", null); + d.add(.err, "#jni_call requires env (optional in #jni_env scope), target, method name, and signature", null); } return Ref.none; } const ret_ty = self.resolveType(fic.return_type); - const env_ref = self.lowerExpr(fic.args[0]); - const target_ref = self.lowerExpr(fic.args[1]); - const name_node = fic.args[2]; - const sig_node = fic.args[3]; + + const env_ref = if (env_omitted) blk: { + if (self.jni_env_stack.items.len == 0) { + if (self.diagnostics) |d| { + d.add(.err, "#jni_call with omitted env requires an enclosing #jni_env scope", null); + } + return Ref.none; + } + break :blk self.jni_env_stack.items[self.jni_env_stack.items.len - 1]; + } else self.lowerExpr(fic.args[0]); + + const target_idx: usize = if (env_omitted) 0 else 1; + const name_idx: usize = target_idx + 1; + const sig_idx: usize = target_idx + 2; + const first_method_arg_idx: usize = target_idx + 3; + + const target_ref = self.lowerExpr(fic.args[target_idx]); + const name_node = fic.args[name_idx]; + const sig_node = fic.args[sig_idx]; const name_ref = self.lowerExpr(name_node); const sig_ref = self.lowerExpr(sig_node); @@ -3887,7 +3913,7 @@ pub const Lowering = struct { null; var extra = std.ArrayList(Ref).empty; - var ai: usize = 4; + var ai: usize = first_method_arg_idx; while (ai < fic.args.len) : (ai += 1) { extra.append(self.alloc, self.lowerExpr(fic.args[ai])) catch unreachable; } diff --git a/tests/expected/ffi-jni-env-02-lexical-direct.exit b/tests/expected/ffi-jni-env-02-lexical-direct.exit index d00491f..573541a 100644 --- a/tests/expected/ffi-jni-env-02-lexical-direct.exit +++ b/tests/expected/ffi-jni-env-02-lexical-direct.exit @@ -1 +1 @@ -1 +0 diff --git a/tests/expected/ffi-jni-env-02-lexical-direct.ir b/tests/expected/ffi-jni-env-02-lexical-direct.ir new file mode 100644 index 0000000..759bf5a --- /dev/null +++ b/tests/expected/ffi-jni-env-02-lexical-direct.ir @@ -0,0 +1,291 @@ + +@context = internal global { { ptr, ptr, ptr }, ptr } zeroinitializer +@g_should_call = internal global i1 false +@str = private unnamed_addr constant [5 x i8] c"noop\00", align 1 +@str.1 = private unnamed_addr constant [4 x i8] c"()V\00", align 1 +@SX_JNI_CLS_noop____V = internal global ptr null +@SX_JNI_MID_noop____V = internal global ptr null +@str.2 = private unnamed_addr constant [4 x i8] c"ok\0A\00", align 1 +@str.3 = private unnamed_addr constant [1 x i8] zeroinitializer, align 1 + +; Function Attrs: nounwind +declare void @out(ptr) #0 + +declare ptr @malloc(i64) + +declare ptr @memcpy(ptr, ptr, i64) + +declare ptr @memset(ptr, i32, i64) + +declare void @free(ptr) + +; Function Attrs: nounwind +declare void @GPA.create(ptr sret({ ptr, ptr, ptr }), ptr) #0 + +; Function Attrs: nounwind +define internal ptr @GPA.alloc(ptr %0, i64 %1) #0 { +entry: + %alloca = alloca ptr, align 8 + store ptr %0, ptr %alloca, align 8 + %allocaN = alloca i64, align 8 + store i64 %1, ptr %allocaN, align 8 + %load = load ptr, ptr %alloca, align 8 + %gep = getelementptr inbounds { i64 }, ptr %load, i32 0, i32 0 + %loadN = load i64, ptr %gep, align 8 + %add = add i64 %loadN, 1 + store i64 %add, ptr %gep, align 8 + %loadN = load i64, ptr %allocaN, align 8 + %malloc = call ptr @malloc(i64 %loadN) + ret ptr %malloc +} + +; Function Attrs: nounwind +define internal void @GPA.dealloc(ptr %0, ptr %1) #0 { +entry: + %alloca = alloca ptr, align 8 + store ptr %0, ptr %alloca, align 8 + %allocaN = alloca ptr, align 8 + store ptr %1, ptr %allocaN, align 8 + %load = load ptr, ptr %alloca, align 8 + %gep = getelementptr inbounds { i64 }, ptr %load, i32 0, i32 0 + %loadN = load i64, ptr %gep, align 8 + %sub = sub i64 %loadN, 1 + store i64 %sub, ptr %gep, align 8 + %loadN = load ptr, ptr %allocaN, align 8 + call void @free(ptr %loadN) + ret void +} + +; Function Attrs: nounwind +declare void @Arena.add_chunk(ptr, i64) #0 + +; Function Attrs: nounwind +declare void @Arena.create(ptr sret({ ptr, ptr, ptr }), ptr, ptr, i64) #0 + +; Function Attrs: nounwind +declare void @Arena.reset(ptr) #0 + +; Function Attrs: nounwind +declare void @Arena.deinit(ptr) #0 + +; Function Attrs: nounwind +declare ptr @Arena.alloc(ptr, i64) #0 + +; Function Attrs: nounwind +declare void @Arena.dealloc(ptr, ptr) #0 + +; Function Attrs: nounwind +declare void @BufAlloc.create(ptr sret({ ptr, ptr, ptr }), ptr, ptr, i64) #0 + +; Function Attrs: nounwind +declare void @BufAlloc.reset(ptr) #0 + +; Function Attrs: nounwind +declare ptr @BufAlloc.alloc(ptr, i64) #0 + +; Function Attrs: nounwind +declare void @BufAlloc.dealloc(ptr, ptr) #0 + +; Function Attrs: nounwind +define internal { ptr, i64 } @cstring(i64 %0) #0 { +entry: + %alloca = alloca i64, align 8 + store i64 %0, ptr %alloca, align 8 + %load = load i64, ptr %alloca, align 8 + %add = add i64 %load, 1 + %heap = call ptr @malloc(i64 %add) + %allocaN = alloca ptr, align 8 + store ptr %heap, ptr %allocaN, align 8 + %loadN = load ptr, ptr %allocaN, align 8 + %loadN = load i64, ptr %alloca, align 8 + %addN = add i64 %loadN, 1 + %1 = call ptr @memset(ptr %loadN, i32 0, i64 %addN) + %allocaN = alloca { ptr, i64 }, align 8 + store { ptr, i64 } undef, ptr %allocaN, align 8 + %loadN = load ptr, ptr %allocaN, align 8 + %gep = getelementptr inbounds { ptr, i64 }, ptr %allocaN, i32 0, i32 0 + %pti = ptrtoint ptr %loadN to i64 + store i64 %pti, ptr %gep, align 8 + %loadN = load i64, ptr %alloca, align 8 + %gepN = getelementptr inbounds { ptr, i64 }, ptr %allocaN, i32 0, i32 1 + store i64 %loadN, ptr %gepN, align 8 + %loadN = load { ptr, i64 }, ptr %allocaN, align 8 + ret { ptr, i64 } %loadN +} + +; Function Attrs: nounwind +declare ptr @int_to_string(i64) #0 + +; Function Attrs: nounwind +declare ptr @bool_to_string(i1) #0 + +; Function Attrs: nounwind +declare ptr @float_to_string(double) #0 + +; Function Attrs: nounwind +declare void @hex_group(ptr, i64, i64) #0 + +; Function Attrs: nounwind +declare ptr @int_to_hex_string(i64) #0 + +; Function Attrs: nounwind +define internal { ptr, i64 } @concat({ ptr, i64 } %0, { ptr, i64 } %1) #0 { +entry: + %alloca = alloca { ptr, i64 }, align 8 + store { ptr, i64 } %0, ptr %alloca, align 8 + %allocaN = alloca { ptr, i64 }, align 8 + store { ptr, i64 } %1, ptr %allocaN, align 8 + %load = load { ptr, i64 }, ptr %alloca, align 8 + %len = extractvalue { ptr, i64 } %load, 1 + %allocaN = alloca i64, align 8 + store i64 %len, ptr %allocaN, align 8 + %loadN = load { ptr, i64 }, ptr %allocaN, align 8 + %lenN = extractvalue { ptr, i64 } %loadN, 1 + %allocaN = alloca i64, align 8 + store i64 %lenN, ptr %allocaN, align 8 + %loadN = load i64, ptr %allocaN, align 8 + %loadN = load i64, ptr %allocaN, align 8 + %add = add i64 %loadN, %loadN + %call = call { ptr, i64 } @cstring(i64 %add) + %allocaN = alloca { ptr, i64 }, align 8 + store { ptr, i64 } %call, ptr %allocaN, align 8 + %loadN = load { ptr, i64 }, ptr %allocaN, align 8 + %dptr = extractvalue { ptr, i64 } %loadN, 0 + %loadN = load { ptr, i64 }, ptr %alloca, align 8 + %dptrN = extractvalue { ptr, i64 } %loadN, 0 + %loadN = load i64, ptr %allocaN, align 8 + %2 = call ptr @memcpy(ptr %dptr, ptr %dptrN, i64 %loadN) + %loadN = load i64, ptr %allocaN, align 8 + %loadN = load { ptr, i64 }, ptr %allocaN, align 8 + %igp.data = extractvalue { ptr, i64 } %loadN, 0 + %igp.ptr = getelementptr i8, ptr %igp.data, i64 %loadN + %loadN = load { ptr, i64 }, ptr %allocaN, align 8 + %dptrN = extractvalue { ptr, i64 } %loadN, 0 + %loadN = load i64, ptr %allocaN, align 8 + %3 = call ptr @memcpy(ptr %igp.ptr, ptr %dptrN, i64 %loadN) + %loadN = load { ptr, i64 }, ptr %allocaN, align 8 + ret { ptr, i64 } %loadN +} + +; Function Attrs: nounwind +define internal { ptr, i64 } @substr({ ptr, i64 } %0, i64 %1, i64 %2) #0 { +entry: + %alloca = alloca { ptr, i64 }, align 8 + store { ptr, i64 } %0, ptr %alloca, align 8 + %allocaN = alloca i64, align 8 + store i64 %1, ptr %allocaN, align 8 + %allocaN = alloca i64, align 8 + store i64 %2, ptr %allocaN, align 8 + %load = load i64, ptr %allocaN, align 8 + %call = call { ptr, i64 } @cstring(i64 %load) + %allocaN = alloca { ptr, i64 }, align 8 + store { ptr, i64 } %call, ptr %allocaN, align 8 + %loadN = load { ptr, i64 }, ptr %allocaN, align 8 + %dptr = extractvalue { ptr, i64 } %loadN, 0 + %loadN = load i64, ptr %allocaN, align 8 + %loadN = load { ptr, i64 }, ptr %alloca, align 8 + %igp.data = extractvalue { ptr, i64 } %loadN, 0 + %igp.ptr = getelementptr i8, ptr %igp.data, i64 %loadN + %loadN = load i64, ptr %allocaN, align 8 + %3 = call ptr @memcpy(ptr %dptr, ptr %igp.ptr, i64 %loadN) + %loadN = load { ptr, i64 }, ptr %allocaN, align 8 + ret { ptr, i64 } %loadN +} + +; Function Attrs: nounwind +declare ptr @any_to_string([2 x i64]) #0 + +; Function Attrs: nounwind +declare ptr @build_format(ptr) #0 + +; Function Attrs: nounwind +define internal void @unused_jni(ptr %0, ptr %1) #0 { +entry: + %alloca = alloca ptr, align 8 + store ptr %0, ptr %alloca, align 8 + %allocaN = alloca ptr, align 8 + store ptr %1, ptr %allocaN, align 8 + %load = load ptr, ptr %alloca, align 8 + %loadN = load ptr, ptr %allocaN, align 8 + %jni.ifs = load ptr, ptr %load, align 8 + %jni.cached.mid = load ptr, ptr @SX_JNI_MID_noop____V, align 8 + %jni.is.cached = icmp ne ptr %jni.cached.mid, null + br i1 %jni.is.cached, label %jni.cont, label %jni.miss + +jni.miss: ; preds = %entry + %2 = getelementptr inbounds ptr, ptr %jni.ifs, i32 31 + %jni.GetObjectClass = load ptr, ptr %2, align 8 + %jni.cls = call ptr %jni.GetObjectClass(ptr %load, ptr %loadN) + %3 = getelementptr inbounds ptr, ptr %jni.ifs, i32 21 + %jni.NewGlobalRef = load ptr, ptr %3, align 8 + %jni.global.cls = call ptr %jni.NewGlobalRef(ptr %load, ptr %jni.cls) + store ptr %jni.global.cls, ptr @SX_JNI_CLS_noop____V, align 8 + %4 = getelementptr inbounds ptr, ptr %jni.ifs, i32 33 + %jni.GetMethodID = load ptr, ptr %4, align 8 + %jni.fresh.mid = call ptr %jni.GetMethodID(ptr %load, ptr %jni.global.cls, ptr @str, ptr @str.1) + store ptr %jni.fresh.mid, ptr @SX_JNI_MID_noop____V, align 8 + br label %jni.cont + +jni.cont: ; preds = %jni.miss, %entry + %jni.mid = phi ptr [ %jni.cached.mid, %entry ], [ %jni.fresh.mid, %jni.miss ] + %5 = getelementptr inbounds ptr, ptr %jni.ifs, i32 61 + %jni.callfn = load ptr, ptr %5, align 8 + call void %jni.callfn(ptr %load, ptr %loadN, ptr %jni.mid) + ret void +} + +; Function Attrs: nounwind +define i32 @main() #0 { +entry: + %alloca = alloca { i64 }, align 8 + store { i64 } zeroinitializer, ptr %alloca, align 8 + %si = insertvalue { ptr, ptr, ptr } undef, ptr %alloca, 0 + %siN = insertvalue { ptr, ptr, ptr } %si, ptr @__thunk_GPA_Allocator_alloc, 1 + %siN = insertvalue { ptr, ptr, ptr } %siN, ptr @__thunk_GPA_Allocator_dealloc, 2 + %siN = insertvalue { { ptr, ptr, ptr }, ptr } undef, { ptr, ptr, ptr } %siN, 0 + %siN = insertvalue { { ptr, ptr, ptr }, ptr } %siN, ptr null, 1 + store { { ptr, ptr, ptr }, ptr } %siN, ptr @context, align 8 + %gload = load i1, ptr @g_should_call, align 1 + br i1 %gload, label %if.then.0, label %if.merge.1 + +if.then.0: ; preds = %entry + call void @unused_jni(ptr null, ptr null) + br label %if.merge.1 + +if.merge.1: ; preds = %if.then.0, %entry + %allocaN = alloca { ptr, i64 }, align 8 + %gep = getelementptr inbounds { ptr, i64 }, ptr %allocaN, i32 0, i32 0 + store ptr null, ptr %gep, align 8 + %gepN = getelementptr inbounds { ptr, i64 }, ptr %allocaN, i32 0, i32 1 + store i64 0, ptr %gepN, align 8 + %allocaN = alloca { ptr, i64 }, align 8 + store { ptr, i64 } { ptr @str.2, i64 3 }, ptr %allocaN, align 8 + %allocaN = alloca { ptr, i64 }, align 8 + store { ptr, i64 } { ptr @str.3, i64 0 }, ptr %allocaN, align 8 + %load = load { ptr, i64 }, ptr %allocaN, align 8 + %loadN = load { ptr, i64 }, ptr %allocaN, align 8 + %call = call { ptr, i64 } @substr({ ptr, i64 } %loadN, i64 0, i64 3) + %callN = call { ptr, i64 } @concat({ ptr, i64 } %load, { ptr, i64 } %call) + store { ptr, i64 } %callN, ptr %allocaN, align 8 + %loadN = load { ptr, i64 }, ptr %allocaN, align 8 + %str.ptr = extractvalue { ptr, i64 } %loadN, 0 + %str.len = extractvalue { ptr, i64 } %loadN, 1 + %0 = call i64 @write(i32 1, ptr %str.ptr, i64 %str.len) + ret i32 0 +} + +; Function Attrs: nounwind +define internal ptr @__thunk_GPA_Allocator_alloc(ptr %0, i64 %1) #0 { +entry: + %call = call ptr @GPA.alloc(ptr %0, i64 %1) + ret ptr %call +} + +; Function Attrs: nounwind +define internal void @__thunk_GPA_Allocator_dealloc(ptr %0, ptr %1) #0 { +entry: + call void @GPA.dealloc(ptr %0, ptr %1) + ret void +} + +declare i64 @write(i32, ptr, i64) diff --git a/tests/expected/ffi-jni-env-02-lexical-direct.txt b/tests/expected/ffi-jni-env-02-lexical-direct.txt index ff683ca..9766475 100644 --- a/tests/expected/ffi-jni-env-02-lexical-direct.txt +++ b/tests/expected/ffi-jni-env-02-lexical-direct.txt @@ -1 +1 @@ -/Users/agra/projects/sx/examples/ffi-jni-env-02-lexical-direct.sx: error: #jni_call requires env, target, method name, and signature +ok