d946e3d577
Inside a `#jni_main` (or any sx-defined `#jni_class`) bodied method,
`super.method(args)` lowers to JNI's nonvirtual dispatch against the
parent class resolved via `#extends` (default `android.app.Activity`).
- lower.zig: tracks `current_foreign_class` + `current_foreign_method`
around each `synthesizeJniMainStub` body; pushes the JNIEnv* arg
onto the lexical `#jni_env` stack so omitted-env JNI calls inside
the body see env without a wrapper. New `lowerSuperCall` handles
the `super.method(args)` receiver pattern: derives parent path,
reuses the enclosing method's signature when names match (the
common `super.<override>(args)` case), or looks up the method on
the parent class declared as `#foreign #jni_class`.
- inst.zig: `JniMsgSend` gains `is_nonvirtual: bool` and
`parent_class_path: ?[]const u8` — the dispatch tag + super class
foreign path. Mutually exclusive with `is_static`.
- emit_llvm.zig: new `CallNonvirtual<T>Method` vtable slots + a
fourth dispatch arm. Resolves the parent jclass via
`FindClass(env, parent_path)` (per-call; caching is follow-up),
then `GetMethodID(env, parent_cls, name, sig)`, then
`CallNonvirtual<T>Method(env, obj, parent_cls, mid, args...)`.
Disassembly on the smoke confirms the chain:
`ldr [env+0x30]` (FindClass) → `ldr [env+0x108]` (GetMethodID) →
`ldr [env+0x2d8]` (CallNonvirtualVoidMethod) with `(env, self,
parent_cls, mid, bundle)`.
132 host / 5 cross / zig build test all green. The slice unblocks
Activity lifecycle overrides (onCreate, onResume, onPause) calling
their required `super.<method>(args)` without raw `#jni_call`
boilerplate.
94 lines
3.2 KiB
Bash
Executable File
94 lines
3.2 KiB
Bash
Executable File
#!/bin/bash
|
|
# Cross-compile regression runner.
|
|
#
|
|
# For each (target, example) tuple, runs `./sx build --target <t> <example>`
|
|
# and asserts (a) exit 0 and (b) the expected output file was produced.
|
|
# Compile correctness only — these examples can't be executed on the host
|
|
# (iOS Obj-C runtime / Android NDK).
|
|
#
|
|
# Tuple list starts empty and grows as Phase 0 / 1 / 2 / 3 of the FFI plan
|
|
# add cross-only examples. Skips with a warning (still exits 0) when the
|
|
# required toolchain isn't installed, so contributors without the iOS SDK
|
|
# or Android NDK aren't blocked.
|
|
#
|
|
# Usage: ./tests/cross_compile.sh
|
|
|
|
set -uo pipefail
|
|
|
|
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
|
ROOT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
|
|
SX="$ROOT_DIR/zig-out/bin/sx"
|
|
TMP_DIR="${TMPDIR:-/tmp}/sx-cross-compile"
|
|
mkdir -p "$TMP_DIR"
|
|
|
|
# Tuple format: "<target>|<example_path>"
|
|
# Add entries as cross-only examples land. Verifies the example
|
|
# compiles cleanly for the target's NDK / SDK without needing the
|
|
# host to actually run it.
|
|
TUPLES=(
|
|
"android|examples/ffi-objc-call-10-os-gate.sx"
|
|
"android|examples/ffi-jni-call-02-void.sx"
|
|
# Step 1.24: verify the inverse OS gate — `inline if OS == .android
|
|
# { #jni_call(...) }` must strip its body before lowering on iOS so
|
|
# emit_llvm doesn't try to use libjvm symbols the iOS SDK lacks.
|
|
"ios-sim|examples/ffi-jni-call-02-void.sx"
|
|
# #jni_main pipeline slice 2: an example carrying a `#jni_main
|
|
# #jni_class(...)` decl must continue to lower + link cleanly for
|
|
# android even without an APK build (compile-only check).
|
|
"android|examples/ffi-jni-main-01-emit.sx"
|
|
# `super.method(args)` dispatch: lowers to JNI CallNonvirtualVoidMethod
|
|
# against the parent class (Activity by default). Compile-only check
|
|
# — runtime correctness is verified by on-device chess deploy.
|
|
"android|examples/ffi-jni-main-02-super.sx"
|
|
)
|
|
|
|
PASS=0
|
|
FAIL=0
|
|
SKIP=0
|
|
|
|
toolchain_available() {
|
|
local target="$1"
|
|
case "$target" in
|
|
ios|ios-sim)
|
|
xcrun --sdk iphonesimulator --show-sdk-path >/dev/null 2>&1
|
|
;;
|
|
android|android-arm64)
|
|
# discoverAndroidNdk in target.zig accepts $ANDROID_NDK_HOME,
|
|
# $ANDROID_NDK_ROOT, or a scan of $HOME/Library/Android/sdk/ndk.
|
|
[[ -n "${ANDROID_NDK_HOME:-}" || -n "${ANDROID_NDK_ROOT:-}" ]] \
|
|
|| [[ -d "$HOME/Library/Android/sdk/ndk" ]]
|
|
;;
|
|
*)
|
|
return 1
|
|
;;
|
|
esac
|
|
}
|
|
|
|
for tuple in "${TUPLES[@]:-}"; do
|
|
[[ -z "$tuple" ]] && continue
|
|
target="${tuple%%|*}"
|
|
example="${tuple#*|}"
|
|
label="$target / $(basename "$example" .sx)"
|
|
|
|
if ! toolchain_available "$target"; then
|
|
SKIP=$((SKIP + 1))
|
|
printf " %-50s SKIP (no toolchain)\n" "$label"
|
|
continue
|
|
fi
|
|
|
|
out_obj="$TMP_DIR/$(basename "$example" .sx).$target.o"
|
|
printf " %-50s" "$label"
|
|
"$SX" build --target "$target" -o "$out_obj" "$ROOT_DIR/$example" >/dev/null 2>&1
|
|
rc=$?
|
|
if [[ $rc -eq 0 && -s "$out_obj" ]]; then
|
|
PASS=$((PASS + 1))
|
|
echo "ok"
|
|
else
|
|
FAIL=$((FAIL + 1))
|
|
echo "FAIL (exit=$rc, output=$out_obj)"
|
|
fi
|
|
done
|
|
|
|
echo "$PASS passed, $FAIL failed, $SKIP skipped"
|
|
[[ $FAIL -eq 0 ]]
|