Merge pull request #18 from LLeavesG/fix/control-flow-boundary-identity

Preserve control-flow boundary identities across monitors, phis, and aliases

Author: asLody

dexdec/src/analysis/java_backend/declaration_lowering.rs

@@ -1021,6 +1021,19 @@ impl<'a> JavaTypeLowering<'a> {
         let signature = declaration.signature.as_ref();
         let annotations = self.method_annotations(declaration)?;
         let mut name_scope = crate::language::java::JavaNameScope::default();
+        let reserved_type_qualifiers = method
+            .body
+            .as_ref()
+            .into_iter()
+            .flat_map(super::java_model::method::JavaMethodBody::static_owner_types)
+            .map(|owner| self.names.resolve_type(&owner))
+            .collect::<Result<Vec<_>, _>>()?
+            .iter()
+            .filter_map(source_type_qualifier)
+            .collect::<std::collections::BTreeSet<_>>();
+        for qualifier in &reserved_type_qualifiers {
+            name_scope.reserve(qualifier.clone());
+        }
         let parameter_naming = super::semantic_naming::ParameterNameRecovery::new(self.names);
         let mut visible_parameter = 0usize;
         let parameter_names = declaration
@@ -1166,12 +1179,17 @@ impl<'a> JavaTypeLowering<'a> {
                             source_type_bounds.clone(),
                             generic_throw_types.clone(),
                             outer_instances,
-                            declaration
-                                .kind
-                                .is_class_initializer()
-                                .then(|| owner.map(|owner| self.members.field_names(owner)))
-                                .flatten()
-                                .unwrap_or_default(),
+                            {
+                                let mut reserved = reserved_type_qualifiers.clone();
+                                if declaration.kind.is_class_initializer() {
+                                    reserved.extend(
+                                        owner
+                                            .map(|owner| self.members.field_names(owner))
+                                            .unwrap_or_default(),
+                                    );
+                                }
+                                reserved
+                            },
                             declaration.kind.is_class_initializer(),
                             self.observer.clone(),
                         )
@@ -1692,6 +1710,16 @@ fn type_kind(kind: JavaClassKind) -> JavaTypeDeclarationKind {
     }
 }
 
+/// The first source component is the expression qualifier that a static
+/// member access must keep visible. Reserving it prevents a local binding from
+/// turning `Owner.field` into an access through an unrelated local variable.
+fn source_type_qualifier(ty: &JavaType) -> Option<JavaIdentifier> {
+    let JavaType::Class(class) = ty else {
+        return None;
+    };
+    class.segments.first().map(|segment| segment.name.clone())
+}
+
 fn method_kind(kind: MethodModelKind) -> JavaMethodDeclarationKind {
     match kind {
         MethodModelKind::Method => JavaMethodDeclarationKind::Method,
@@ -1706,6 +1734,19 @@ mod tests {
     use crate::ir::generic_types::GenericSignatures;
     use crate::language::java::GenericTypeProjection;
 
+    #[test]
+    fn static_type_qualifier_is_reserved_from_local_names() {
+        let owner = JavaType::source_class("a");
+        let owner = source_type_qualifier(&owner).expect("owner qualifier");
+        let mut names = crate::language::java::JavaNameScope::default();
+        names.reserve(owner);
+
+        assert_eq!(
+            names.claim(JavaIdentifier::from_dex("a")),
+            JavaIdentifier::from_dex("a2")
+        );
+    }
+
     #[test]
     fn merged_throwable_rethrow_uses_generic_cast_but_catch_parameter_does_not() {
         let throwable = JavaType::source_class("Throwable");

dexdec/src/analysis/java_backend/java_model/method.rs

@@ -150,6 +150,14 @@ impl JavaMethodBody {
         collector.fields
     }
 
+    pub(in crate::analysis::java_backend) fn static_owner_types(
+        &self,
+    ) -> std::collections::BTreeSet<ArgType> {
+        let mut collector = MemberReferenceCollector::default();
+        crate::ir::SemanticVisitor::visit_node(&mut collector, self.semantic.body());
+        collector.static_owners
+    }
+
     pub(in crate::analysis::java_backend) fn outer_instance_field(
         &self,
     ) -> Option<(&crate::ir::FieldReference, &ArgType)> {
@@ -356,15 +364,25 @@ impl JavaMethodBody {
 struct MemberReferenceCollector {
     methods: std::collections::BTreeSet<crate::ir::MethodReference>,
     fields: std::collections::BTreeSet<crate::ir::FieldReference>,
+    static_owners: std::collections::BTreeSet<ArgType>,
 }
 
 impl crate::ir::SemanticVisitor for MemberReferenceCollector {
     fn enter_operation(&mut self, operation: &crate::ir::SemanticOperation) {
         match operation.payload.reference.as_ref() {
             Some(crate::ir::MemberReference::Method(method)) => {
+                if operation.payload.invoke_type == Some(crate::ir::InvokeType::Static) {
+                    self.static_owners.insert(method.owner.clone());
+                }
                 self.methods.insert(method.clone());
             }
             Some(crate::ir::MemberReference::Field(field)) => {
+                if matches!(
+                    operation.insn_type,
+                    crate::ir::InsnType::Sget | crate::ir::InsnType::Sput
+                ) {
+                    self.static_owners.insert(field.owner.clone());
+                }
                 self.fields.insert(field.clone());
             }
             None => {}