Drop M7 FFI source-shape guards

Author: Frityet

notes/ci-source-search-policy.md

@@ -23,6 +23,13 @@ output, CSVs, or marker files. Generic file/text helpers remain available for
 those artifacts, but must not be paired with `src/*.c`, `src/*.h`,
 `src/*.dasc`, `tests/*.lua`, or `tools/*.sh` snippet checks.
 
+2026-07-01 follow-up: removed the stale M7 Perl guards that read
+`src/lj_ccall.c`, `src/lj_cconv.c`, `src/lj_carith.c`, and `src/lib_bit.c`.
+Their useful signal now lives in the existing parser-token behavior fixtures:
+`t-ffi-ccall-struct-overflow.c`, `t-ffi-cconv-init-snapshot.c`,
+`t-ffi-cdata-conv-snapshot.c`, `t-ffi-carith-check64-snapshot.c`, and
+`t-ffi-carith-arg-snapshot.c`.
+
 The only supported shell entrypoint under `tools/ci/` is
 `tools/ci/lua_test.sh`. Run focused cases as
 `tools/ci/lua_test.sh <case...>`; do not add per-case compatibility wrapper

tests/suites/m7_ffi.lua

@@ -88,126 +88,6 @@ local function build_clib_ldscript_fixture(t)
   return write_ld_script(script, so)
 end
 
-local function assert_ccall_struct_arg_uses_cached_align(t)
-  local script = [[
-my $path = shift @ARGV;
-open my $fh, "<", $path or die "$path: $!\n";
-local $/;
-my $src = <$fh>;
-$src =~ /(static int ccall_struct_arg.*?\n})/s
-  or die "missing ccall_struct_arg body\n";
-my $body = $1;
-my $conv = index($body, "lj_cconv_ct_tv_l");
-die "missing ccall_struct_arg conversion call\n" if $conv < 0;
-die "missing cached stack alignment before conversion\n"
-  unless $body =~ /MSize\s+align\s*=\s*\(1u\s*<<\s*ctype_align\(ctype_info_acq\(d\)\)\)\s*-\s*1;/;
-my $tail = substr($body, $conv);
-die "ccall_struct_arg reads d ctype info after wait-capable conversion\n"
-  if $tail =~ /ctype_info_acq\s*\(\s*d\s*\)/;
-]]
-  utils.capture_command("perl -e " .. shell_quote(script) .. " " ..
-                        shell_quote(t:path("src", "lj_ccall.c")),
-                        { stderr = true })
-end
-
-local function assert_cconv_ct_tv_snapshots_destination(t)
-  local script = [[
-my $path = shift @ARGV;
-open my $fh, "<", $path or die "$path: $!\n";
-local $/;
-my $src = <$fh>;
-$src =~ /(void lj_cconv_ct_tv_l\(.*?\n})/s
-  or die "missing lj_cconv_ct_tv_l body\n";
-my $body = $1;
-my $copy = index($body, "cconv_ctype_copy(&dsnap, d);");
-my $assign = index($body, "d = &dsnap;");
-die "missing destination snapshot copy in lj_cconv_ct_tv_l\n"
-  if $copy < 0 || $assign < 0 || $copy > $assign;
-my $first_wait = length($body);
-for my $needle ("cconv_ctype_snapshot_wait", "cconv_rawid_wait",
-                "lj_ctype_enumconst_wait") {
-  my $idx = index($body, $needle);
-  $first_wait = $idx if $idx >= 0 && $idx < $first_wait;
-}
-die "destination snapshot is after a wait-capable ctype lookup\n"
-  if $assign > $first_wait;
-]]
-  utils.capture_command("perl -e " .. shell_quote(script) .. " " ..
-                        shell_quote(t:path("src", "lj_cconv.c")),
-                        { stderr = true })
-end
-
-local function assert_cconv_ct_ct_snapshots_operands(t)
-  local script = [[
-my $path = shift @ARGV;
-open my $fh, "<", $path or die "$path: $!\n";
-local $/;
-my $src = <$fh>;
-$src =~ /(void lj_cconv_ct_ct_l\(.*?\n})/s
-  or die "missing lj_cconv_ct_ct_l body\n";
-my $body = $1;
-my @required = (
-  "cconv_ctype_copy(&dsnap, d);",
-  "cconv_ctype_copy(&ssnap, s);",
-  "d = &dsnap;",
-  "s = &ssnap;"
-);
-my $last = -1;
-for my $needle (@required) {
-  my $idx = index($body, $needle);
-  die "missing raw C-to-C operand snapshot step: $needle\n" if $idx < 0;
-  die "raw C-to-C operand snapshot steps are out of order\n" if $idx < $last;
-  $last = $idx;
-}
-my $first_wait = length($body);
-for my $needle ("cconv_ctype_snapshot_wait", "cconv_rawid_wait",
-                "lj_ctype_enumconst_wait") {
-  my $idx = index($body, $needle);
-  $first_wait = $idx if $idx >= 0 && $idx < $first_wait;
-}
-die "raw C-to-C operand snapshots are after a wait-capable ctype lookup\n"
-  if $last > $first_wait;
-]]
-  utils.capture_command("perl -e " .. shell_quote(script) .. " " ..
-                        shell_quote(t:path("src", "lj_cconv.c")),
-                        { stderr = true })
-end
-
-local function assert_carith_operands_use_snapshots(t)
-  local script = [[
-my ($carith, $bit) = @ARGV;
-open my $fh, "<", $carith or die "$carith: $!\n";
-local $/;
-my $src = <$fh>;
-die "arithmetic ctype refresh helpers remain\n"
-  if $src =~ /carith_refresh_(?:prior_)?ctypes/;
-die "missing arithmetic operand snapshot helper\n"
-  unless $src =~ /static void carith_set_operand_snapshot/;
-die "missing arithmetic operand ID snapshot helper\n"
-  unless $src =~ /static void carith_set_operand_id/;
-die "lj_carith_check64 source still returns a live CType pointer\n"
-  if $src =~ /CType\s+\*\*spct/;
-while ($src =~ /^([^\n]*ctype_get\(cts[^\n]*)$/mg) {
-  my $line = $1;
-  next if $line =~ /carith_ctype_copy\s*\(/;
-  die "raw ctype_get in lj_carith.c outside local copy: $line\n";
-}
-open my $bfh, "<", $bit or die "$bit: $!\n";
-$src = <$bfh>;
-die "missing bit library CType copy helper\n"
-  unless $src =~ /static void bit_ctype_copy/;
-while ($src =~ /^([^\n]*ctype_get\(cts[^\n]*)$/mg) {
-  my $line = $1;
-  next if $line =~ /bit_ctype_copy\s*\(/;
-  die "raw ctype_get in lib_bit.c outside local copy: $line\n";
-}
-]]
-  utils.capture_command("perl -e " .. shell_quote(script) .. " " ..
-                        shell_quote(t:path("src", "lj_carith.c")) .. " " ..
-                        shell_quote(t:path("src", "lib_bit.c")),
-                        { stderr = true })
-end
-
 return function(add)
   add({
     name = "m7_ffi_ccall_native",
@@ -216,7 +96,6 @@ return function(add)
       local struct_so
       assert_recorded_ffi_calls_gate_fails(t)
       clean_build(t)
-      assert_ccall_struct_arg_uses_cached_align(t)
       struct_so = build_shared_library(t,
         t:tmp("lj_t-ffi-ccall-struct-overflow.so"),
         "t-ffi-ccall-struct-overflow-lib.c")
@@ -297,7 +176,6 @@ return function(add)
     description = "FFI arithmetic/raw conversion behavior",
     run = function(t)
       clean_build(t)
-      assert_carith_operands_use_snapshots(t)
       build_and_run_c(t, t:tmp("lj_t-ffi-carith-check64-snapshot"),
                       "t-ffi-carith-check64-snapshot.c",
                       { build = false, timeout = "20s" })
@@ -476,8 +354,6 @@ assert(cl.lj_clib_ldscript_value() == 42)
     description = "FFI ctype metadata snapshot behavior",
     run = function(t)
       clean_build(t)
-      assert_cconv_ct_ct_snapshots_operands(t)
-      assert_cconv_ct_tv_snapshots_destination(t)
       build_and_run_c(t, t:tmp("lj_t-ffi-typeinfo-snapshot"),
                       "t-ffi-typeinfo-snapshot.c", { timeout = "20s" })
       build_and_run_c(t, t:tmp("lj_t-ffi-tonumber-snapshot"),