loki5512344
139aea9a8f
Proven by paranoid runs over lorep (17 classes, fully green), LoVisual (4081 classes) and oc2r (1278 classes) with per-class java -Xverify:all, each fix first reproduced as a red test: - merge: Top absorbs instead of Top-wins (javac declares Top for slots unwritten on some inflow; precise types reject those edges). Regression: loop_head_keeps_top_for_loop_local. - emit: collapse [Long|Double, Top] pairs on operand stacks (javac writes one entry; the pair is rejected). Regression: wide_stack_join_emits_single_entries. - xfer ArrayLoad: push the wide pair, fixing lcmp underflow. Regression: array_load_wide_pushes_pair. - xfer <init>: convert only the receiver's own allocation site instead of every Uninitialized (nested construction clobbered the outer object). Regression: nested_construction_keeps_outer. - xfer ANewArray: array operands gain one dimension ([B] -> [[B) instead of an illegal L-wrap ([L[B;). Covered by the same test. - jar load: duplicate class names (multi-release module-info twins) keep the first occurrence instead of crashing save. Test: duplicate_class_names_keep_first. - strings/constants: skip methods past MAX_METHOD_INSNS (8000) so giants cannot overflow the 64KB writer ceiling. Tests: oversized_methods_are_skipped in both passes. - merge errors now name both types being merged. Also: em-dash removed repo-wide (724 spots, rule added to todo.md), allow-lints only in tests (scratch example deleted), code comments migrated to English in every file this change touches.
47 lines
2.2 KiB
Rust
47 lines
2.2 KiB
Rust
//! Инвариант писателя: записанный пул не содержит дублей `CONSTANT_Utf8`.
|
||
//!
|
||
//! Backend не дедуплицирует (`add_*` всегда толкает новый элемент), а HotSpot
|
||
//! сопоставляет запись `LocalVariableTypeTable` с `LocalVariableTable` по
|
||
//! сырому `name_index`. Дублирующий `Utf8` для одного имени даёт разные индексы
|
||
//! и рушит класс: `ClassFormatError: LVTT entry ... does not match any LVT
|
||
//! entry`. Писатель обязан интернировать строки - поэтому в записанном пуле
|
||
//! каждый `CONSTANT_Utf8` уникален.
|
||
|
||
#![allow(clippy::expect_used, clippy::unwrap_used)]
|
||
|
||
use std::collections::HashSet;
|
||
use std::path::PathBuf;
|
||
|
||
use noxis_classfile::format;
|
||
use ristretto_classfile::{ClassFile as RtClass, Constant};
|
||
|
||
#[test]
|
||
fn written_pool_has_no_duplicate_utf8() {
|
||
let dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests/data");
|
||
let mut names: Vec<PathBuf> = std::fs::read_dir(&dir)
|
||
.expect("tests/data")
|
||
.filter_map(|entry| entry.ok().map(|entry| entry.path()))
|
||
.filter(|path| path.extension().is_some_and(|ext| ext == "class"))
|
||
.collect();
|
||
names.sort();
|
||
assert!(!names.is_empty(), "нет фикстур в tests/data");
|
||
|
||
for path in &names {
|
||
let parsed = format::parse(&std::fs::read(path).expect("read")).expect("parse");
|
||
let written = format::write(&parsed).expect("write");
|
||
let raw = RtClass::from_bytes(&written).expect("written parses");
|
||
raw.verify().expect("written verifies");
|
||
let mut seen = HashSet::new();
|
||
for index in 1..=raw.constant_pool.len() {
|
||
if let Some(Constant::Utf8(value)) = raw.constant_pool.get(index as u16) {
|
||
let bytes = value.as_bytes().to_vec();
|
||
assert!(
|
||
seen.insert(bytes),
|
||
"дубль CONSTANT_Utf8 {:?} в {}",
|
||
String::from_utf8_lossy(value.as_bytes()),
|
||
parsed.this_class
|
||
);
|
||
}
|
||
}
|
||
}
|
||
}
|