boba/obfuskator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

classfile: writer honors itf flag for invokestatic on interfaces

Browse source
This commit is contained in:
Loki 2026-10-11 12:24:50 +02:00
parent 5901c9eb69
commit 4b14eeb40f
Signed by: boba
GPG key ID: 253067914055423B
5 changed files with 123 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/noxis-classfile/src/format/write/code/ops.rs
View file

@ -166,23 +166,28 @@ pub(super) fn convert_op(op: Convert) -> RtInsn {
}
}
/// `invoke*` family: the `itf` flag is authoritative (a Static/Special
/// call may still target an interface method - `List.of`), so the pool
/// entry kind follows it, not the opcode alone.
pub(super) fn invoke(
kind: InvokeKind,
owner: &str,
name: &str,
descriptor: &str,
itf: bool,
pool: &mut Pool,
) -> Result<RtInsn, ClassfileError> {
let itf = itf || matches!(kind, InvokeKind::Interface);
Ok(match kind {
InvokeKind::Virtual => {
RtInsn::Invokevirtual(pool.method_ref(owner, name, descriptor, kind)?)
RtInsn::Invokevirtual(pool.method_ref(owner, name, descriptor, itf)?)
}
InvokeKind::Special => {
RtInsn::Invokespecial(pool.method_ref(owner, name, descriptor, kind)?)
RtInsn::Invokespecial(pool.method_ref(owner, name, descriptor, itf)?)
}
InvokeKind::Static => RtInsn::Invokestatic(pool.method_ref(owner, name, descriptor, kind)?),
InvokeKind::Static => RtInsn::Invokestatic(pool.method_ref(owner, name, descriptor, itf)?),
InvokeKind::Interface => {
let index = pool.method_ref(owner, name, descriptor, kind)?;
let index = pool.method_ref(owner, name, descriptor, itf)?;
RtInsn::Invokeinterface(index, arg_count(descriptor)?)
}
})