feat(control_tree): Phase 131 P1.5-P2 DirectValue exit reconnection
Implement DirectValue mode for Normalized shadow exit handling:
**P1.5 Changes**:
- Add ExitReconnectMode::DirectValue (skip exit PHI generation)
- Carry remapped_exit_values through merge result
- Update host variable_map directly with exit values
- Fix loop(true) { x = 1; break }; return x to return 1 correctly
**P2 Changes**:
- Normalize k_exit continuation entry/exit edges
- Rewrite TailCall(k_exit) → Jump(exit_block) for proper merge
- Add verify_all_terminator_targets_exist contract check
- Extend ExitLineReconnector to handle DirectValue mode
**Infrastructure**:
- tools/build_llvm.sh: Force TMPDIR under target/ (EXDEV mitigation)
- llvm_exe_runner.sh: Add exit_code verification support
- Phase 131 smokes: Update for dev-only + exit code validation
**Contracts**:
- PHI-free: Normalized path uses continuations only
- Exit values reconnect via remapped ValueIds
- Existing patterns unaffected (既定挙動不変)
Related: Phase 131 loop(true) break-once Normalized support
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
@ -46,6 +46,15 @@ fi
|
||||
# Use the cargo target dir when set (helps LLVM EXE smokes that build under /tmp).
|
||||
CARGO_TARGET_DIR_EFFECTIVE="${CARGO_TARGET_DIR:-$PWD/target}"
|
||||
|
||||
# Rust builds (especially rmeta/rlib finalization) may fail with EXDEV when the temp dir
|
||||
# is not compatible with the output directory. Prefer a temp dir under the final output
|
||||
# folder so rustc can atomically persist artifacts without cross-device rename issues.
|
||||
#
|
||||
# NOTE: release/deps may not exist yet on first build, so create it eagerly.
|
||||
TMPDIR_EFFECTIVE="${TMPDIR:-$CARGO_TARGET_DIR_EFFECTIVE/release/deps}"
|
||||
mkdir -p "$TMPDIR_EFFECTIVE"
|
||||
export TMPDIR="$TMPDIR_EFFECTIVE"
|
||||
|
||||
BIN_DEFAULT="$CARGO_TARGET_DIR_EFFECTIVE/release/hakorune"
|
||||
BIN="${NYASH_BIN:-$BIN_DEFAULT}"
|
||||
|
||||
@ -58,10 +67,10 @@ if [[ "$LLVM_FEATURE" == "llvm-inkwell-legacy" ]]; then
|
||||
# Legacy inkwell需要LLVM_SYS_180_PREFIX
|
||||
_LLVMPREFIX=$(llvm-config-18 --prefix)
|
||||
LLVM_SYS_181_PREFIX="${_LLVMPREFIX}" LLVM_SYS_180_PREFIX="${_LLVMPREFIX}" \
|
||||
CARGO_INCREMENTAL=1 cargo build --release -j 24 -p nyash-rust --features "$LLVM_FEATURE" >/dev/null
|
||||
CARGO_INCREMENTAL=0 cargo build --release -j 24 -p nyash-rust --features "$LLVM_FEATURE" >/dev/null
|
||||
else
|
||||
# llvm-harness(デフォルト)はLLVM_SYS_180_PREFIX不要
|
||||
CARGO_INCREMENTAL=1 cargo build --release -j 24 -p nyash-rust --features "$LLVM_FEATURE" >/dev/null
|
||||
CARGO_INCREMENTAL=0 cargo build --release -j 24 -p nyash-rust --features "$LLVM_FEATURE" >/dev/null
|
||||
fi
|
||||
|
||||
if [[ ! -x "$BIN" ]]; then
|
||||
|
||||
@ -191,3 +191,62 @@ llvm_exe_build_and_run_numeric_smoke() {
|
||||
printf "%s\n" "$EXPECTED"
|
||||
return 1
|
||||
}
|
||||
|
||||
llvm_exe_build_and_run_expect_exit_code() {
|
||||
# Required globals:
|
||||
# - INPUT_HAKO
|
||||
# - OUTPUT_EXE
|
||||
# - EXPECTED_EXIT_CODE
|
||||
#
|
||||
# Optional:
|
||||
# - LLVM_BUILD_LOG
|
||||
# - RUN_TIMEOUT_SECS
|
||||
|
||||
if [ -z "${INPUT_HAKO:-}" ] || [ -z "${OUTPUT_EXE:-}" ] || [ -z "${EXPECTED_EXIT_CODE:-}" ]; then
|
||||
echo "[FAIL] llvm_exe_build_and_run_expect_exit_code: missing INPUT_HAKO/OUTPUT_EXE/EXPECTED_EXIT_CODE"
|
||||
return 1
|
||||
fi
|
||||
|
||||
mkdir -p "$(dirname "$OUTPUT_EXE")"
|
||||
|
||||
echo "[INFO] Building: $INPUT_HAKO → $OUTPUT_EXE"
|
||||
|
||||
local cargo_target_dir
|
||||
cargo_target_dir="$(llvm_exe_cargo_target_dir)"
|
||||
|
||||
# Ensure we use the compiler binary built in that target dir.
|
||||
local nyash_bin="$cargo_target_dir/release/hakorune"
|
||||
local obj_out="$cargo_target_dir/aot_objects/$(basename "$INPUT_HAKO").o"
|
||||
mkdir -p "$(dirname "$obj_out")"
|
||||
|
||||
local build_log="${LLVM_BUILD_LOG:-/tmp/llvm_exe_build.log}"
|
||||
if ! env CARGO_TARGET_DIR="$cargo_target_dir" NYASH_BIN="$nyash_bin" NYASH_LLVM_OBJ_OUT="$obj_out" NYASH_DISABLE_PLUGINS=0 \
|
||||
"$NYASH_ROOT/tools/build_llvm.sh" "$INPUT_HAKO" -o "$OUTPUT_EXE" 2>&1 | tee "$build_log"; then
|
||||
echo "[FAIL] build_llvm.sh failed"
|
||||
tail -n 80 "$build_log"
|
||||
return 1
|
||||
fi
|
||||
|
||||
if [ ! -x "$OUTPUT_EXE" ]; then
|
||||
echo "[FAIL] Executable not created or not executable: $OUTPUT_EXE"
|
||||
ls -la "$OUTPUT_EXE" 2>/dev/null || echo "File does not exist"
|
||||
return 1
|
||||
fi
|
||||
|
||||
echo "[INFO] Executing: $OUTPUT_EXE"
|
||||
|
||||
set +e
|
||||
local output
|
||||
output=$(timeout "${RUN_TIMEOUT_SECS:-10}" env NYASH_DISABLE_PLUGINS=0 "$OUTPUT_EXE" 2>&1)
|
||||
local exit_code=$?
|
||||
set -e
|
||||
|
||||
if [ "$exit_code" -ne "$EXPECTED_EXIT_CODE" ]; then
|
||||
echo "[FAIL] Execution exit code mismatch: got $exit_code, expected $EXPECTED_EXIT_CODE"
|
||||
echo "[INFO] Raw output (tail):"
|
||||
echo "$output" | tail -n 80
|
||||
return 1
|
||||
fi
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
@ -9,6 +9,11 @@ require_env || exit 2
|
||||
|
||||
llvm_exe_preflight_or_skip || exit 0
|
||||
|
||||
# Phase 131 is a dev-only Normalized shadow loop case.
|
||||
# LLVM EXE emission must run with JoinIR dev/strict enabled, otherwise it will freeze.
|
||||
export NYASH_JOINIR_DEV=1
|
||||
export HAKO_JOINIR_STRICT=1
|
||||
|
||||
# Phase 131: minimal plugin set (StringBox, ConsoleBox, IntegerBox only)
|
||||
STRINGBOX_SO="$NYASH_ROOT/plugins/nyash-string-plugin/libnyash_string_plugin.so"
|
||||
CONSOLEBOX_SO="$NYASH_ROOT/plugins/nyash-console-plugin/libnyash_console_plugin.so"
|
||||
@ -25,11 +30,10 @@ llvm_exe_ensure_plugins_or_fail || exit 1
|
||||
INPUT_HAKO="$NYASH_ROOT/apps/tests/phase131_loop_true_break_once_min.hako"
|
||||
OUTPUT_EXE="$NYASH_ROOT/tmp/phase131_loop_true_break_once_llvm_exe"
|
||||
|
||||
EXPECTED=$'1'
|
||||
EXPECTED_LINES=1
|
||||
EXPECTED_EXIT_CODE=1
|
||||
LLVM_BUILD_LOG="/tmp/phase131_loop_true_break_once_build.log"
|
||||
if llvm_exe_build_and_run_numeric_smoke; then
|
||||
test_pass "phase131_loop_true_break_once_llvm_exe: output matches expected (1)"
|
||||
if llvm_exe_build_and_run_expect_exit_code; then
|
||||
test_pass "phase131_loop_true_break_once_llvm_exe: exit code matches expected (1)"
|
||||
else
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@ -6,7 +6,6 @@
|
||||
# - Dev-only: NYASH_JOINIR_DEV=1 HAKO_JOINIR_STRICT=1
|
||||
|
||||
source "$(dirname "$0")/../../../lib/test_runner.sh"
|
||||
source "$(dirname "$0")/../../../lib/output_validator.sh"
|
||||
export SMOKES_USE_PYVM=0
|
||||
require_env || exit 2
|
||||
|
||||
@ -34,15 +33,8 @@ if [ "$EXIT_CODE" -eq 124 ]; then
|
||||
FAIL_COUNT=$((FAIL_COUNT + 1))
|
||||
elif [ "$EXIT_CODE" -eq 1 ]; then
|
||||
# Phase 131: expected output is exit code 1 (return value)
|
||||
EXPECTED=$'1'
|
||||
if validate_numeric_output 1 "$EXPECTED" "$OUTPUT"; then
|
||||
echo "[PASS] Output verified: 1 (exit code: $EXIT_CODE)"
|
||||
PASS_COUNT=$((PASS_COUNT + 1))
|
||||
else
|
||||
echo "[INFO] output (tail):"
|
||||
echo "$OUTPUT" | tail -n 50 || true
|
||||
FAIL_COUNT=$((FAIL_COUNT + 1))
|
||||
fi
|
||||
echo "[PASS] exit code verified: 1"
|
||||
PASS_COUNT=$((PASS_COUNT + 1))
|
||||
else
|
||||
echo "[FAIL] hakorune failed with exit code $EXIT_CODE (expected 1)"
|
||||
echo "[INFO] output (tail):"
|
||||
|
||||
Reference in New Issue
Block a user