cd5b958d19
Introduce the welded comptime `compiler` library (`#library "compiler"` +
`abi(.zig) extern compiler`), per design/comptime-compiler-api.md, and unify
`callconv(...)` into the new `abi(...)` annotation.
abi(...) replaces callconv(...):
- New ABI enum { default, c, zig, pure }; `abi(.c|.zig|.pure)` parses in the
postfix slot before extern/export (and standalone). `kw_callconv` -> `kw_abi`.
- Migrated 52 sx files, the call-convention-mismatch diagnostic, and docs
(readme/specs) from `callconv(.c)` to `abi(.c)`.
Phase 1 — welded compiler library (parse -> registry -> validation -> bridge):
- `abi(.zig) extern compiler` parses on fn decls (carries abi/extern_lib) and
struct decls (StructDecl.abi/extern_lib).
- `#library "compiler"` is the comptime-only internal surface — never dlopen'd.
- src/ir/compiler_lib.zig: the binding registry (the safety boundary). `Field`
welded to StructInfo.Field with layout baked from the real Zig type
(@offsetOf/@sizeOf); `findType`/`findFn`. Welded structs are layout-validated
at registration (field set + total size) as a header checked against the impl.
- Host-call bridge: a `fn abi(.zig) extern compiler` dispatches under the
comptime interp to its registered Zig handler (intern/text_of round-trip),
never dlsym. IR Function.compiler_welded; validated in declareFunction.
- Comptime-only enforcement: a runtime call to a welded fn is a clean
build-gating error (emitCall), not an undefined-symbol link failure.
Phase 2.1 — byte-layout weld foundation:
- Decision: full byte-layout weld (sx struct laid out byte-identically to the
bound Zig type). Registered StructInfo (first non-natural / Zig-reordered
layout). `computeWeldPlan` — pure offset-ordered element plan + padding +
sx-field->LLVM-element remap; unit-tested. Emit/interp wiring is the next
sub-step (2.2+, see current/CHECKPOINT-COMPILER-API.md).
Examples: 0625/0626 (welded struct + fn round-trip), 1183/1184/1185
(layout-mismatch, unexported-fn, runtime-call diagnostics).
62 lines
2.1 KiB
Plaintext
62 lines
2.1 KiB
Plaintext
// `xx closure : Block` for an arbitrary closure signature.
|
|
//
|
|
// The stdlib (modules/ffi/objc_block.sx) declares hand-rolled
|
|
// `Into(Block) for Closure() -> void` and `Closure(bool) -> void`
|
|
// impls — the two most common Apple block shapes. Other signatures
|
|
// need a per-shape `__block_invoke_<sig>` trampoline + `Into(Block)`
|
|
// impl declared somewhere reachable (stdlib if shared, in-file if
|
|
// app-specific).
|
|
//
|
|
// This test exercises the user-declared variant: signature
|
|
// `Closure(i32, *void) -> void` (a two-arg block — not in stdlib).
|
|
// If the impl is missing, the compiler emits a focused diagnostic
|
|
// pointing at modules/ffi/objc_block.sx as the template.
|
|
|
|
#import "modules/std.sx";
|
|
#import "modules/ffi/objc_block.sx";
|
|
|
|
// Trampoline matching `void (^)(int, void*)` — the C ABI Apple's
|
|
// runtime calls. Forwards through to the sx closure with the
|
|
// standard `(__sx_ctx, env, ...args)` shape.
|
|
__block_invoke_void_i32_p :: (block_self: *Block, arg0: i32, arg1: *void) abi(.c) {
|
|
typed_fn : (*void, i32, *void) -> void = xx block_self.sx_fn;
|
|
typed_fn(block_self.sx_env, arg0, arg1);
|
|
}
|
|
|
|
impl Into(Block) for Closure(i32, *void) -> void {
|
|
convert :: (self: Closure(i32, *void) -> void) -> Block {
|
|
.{
|
|
isa = @_NSConcreteStackBlock,
|
|
flags = 0,
|
|
reserved = 0,
|
|
invoke = xx @__block_invoke_void_i32_p,
|
|
descriptor = xx @__sx_block_descriptor,
|
|
sx_env = self.env,
|
|
sx_fn = self.fn_ptr,
|
|
}
|
|
}
|
|
}
|
|
|
|
// Side-effect capture so we can observe both args reached the
|
|
// closure body.
|
|
g_sum: i32 = 0;
|
|
g_tag: *void = null;
|
|
|
|
main :: () -> i32 {
|
|
cl := (n: i32, tag: *void) => {
|
|
g_sum = n + 1;
|
|
g_tag = tag;
|
|
};
|
|
b : Block = xx cl;
|
|
|
|
invoke_fn : (*Block, i32, *void) -> void abi(.c) = xx b.invoke;
|
|
sentinel: i32 = 42;
|
|
invoke_fn(@b, 41, xx @sentinel);
|
|
|
|
if g_sum != 42 { print("FAIL: g_sum expected 42, got {}\n", g_sum); return 1; }
|
|
if g_tag == null { print("FAIL: g_tag null\n"); return 1; }
|
|
|
|
print("block multi-arg ok: sum={}\n", g_sum);
|
|
0
|
|
}
|