classfile: intern constant-pool entries on write (fix LVTT/LVT ClassFormatError)
ristretto's ConstantPool never deduplicates: every add_* pushes a new entry. HotSpot matches each LocalVariableTypeTable entry to a LocalVariableTable entry by raw name_index, so when a name (e.g. a local's) was interned twice the two tables got different indices and the class failed to load: 'ClassFormatError: LVTT entry ... does not match any LVT entry'. The writer now memoizes every pool builder by its semantic key and rebuilds composite constants (Class/NameAndType/Fieldref/Methodref/MethodHandle/ Dynamic) from our own utf8/class primitives so ristretto never mints a shadow Utf8. This also shrinks the pool (no more ldc -> ldc_w widening that changed code length on a pure round-trip). Split pool.rs into a pool/ module (refs in pool/refs.rs) to respect the file-size gate. Regression test: tests/pool asserts the written pool has no duplicate CONSTANT_Utf8. Verified: pure parse->write of the neoforge jar (92 classes) now loads under java -Xverify:all with 0 errors.
This commit is contained in:
parent
a2e4c69210
commit
f08bf60635
10 changed files with 509 additions and 206 deletions
|
|
@ -180,6 +180,7 @@ pub(super) fn generate_packages(cfg: &Config, rng: &mut Rng) -> Vec<String> {
|
|||
let style = match cfg.rename.class_style {
|
||||
NameStyle::Unicode => NameStyle::Unicode,
|
||||
NameStyle::IlO0 => NameStyle::IlO0,
|
||||
NameStyle::Plausible => NameStyle::Plausible,
|
||||
_ => NameStyle::MixedLatin,
|
||||
};
|
||||
let mut names = NameGenerator::new(rng.clone(), style).for_classes();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue