From 7096d4156458bf472ceaf8e34c07919529381ebf Mon Sep 17 00:00:00 2001 From: 8e8cd8 <2528484043@qq.com> Date: Mon, 16 Nov 2026 20:30:01 +0800 Subject: [PATCH] fix: use jvm_super in GetSuperclass --- src/androidemu/java/jni_env.py | 20 ++++++++++++---- tests/test_get_superclass.py | 43 ++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 4 deletions(-) create mode 100644 tests/test_get_superclass.py diff --git a/src/androidemu/java/jni_env.py b/src/androidemu/java/jni_env.py index da9ad5a..6ba56e2 100644 --- a/src/androidemu/java/jni_env.py +++ b/src/androidemu/java/jni_env.py @@ -420,6 +420,18 @@ def to_reflected_method(self, uc, env, class_idx, method_id, is_static): else: return Method(clazz.value, method) + @staticmethod + def _java_superclass(clazz_value): + """ + Java superclass via jvm_super (a JavaClassDef-based class). + None / non-type means no Java parent -> JNI NULL. + """ + super_cls = getattr(clazz_value, 'jvm_super', None) + # jvm_super must point to a class (JavaClassDef-based), not an arbitrary object. + if super_cls is not None and isinstance(super_cls, type): + return super_cls + return None + @native_method def get_superclass(self, uc, env, clazz_idx): """ @@ -434,12 +446,12 @@ def get_superclass(self, uc, env, clazz_idx): if not isinstance(clazz, jclass): raise ValueError('Expected a jclass.') - clazzez = clazz.value.__mro__ - - if len(clazzez) < 2: + # Use jvm_super (Java hierarchy), not Python __mro__. + super_cls = self._java_superclass(clazz.value) + if super_cls is None: return None - return self.add_local_reference(jclass(clazzez[1])) + return self.add_local_reference(jclass(super_cls)) @native_method def is_assignable_from(self, uc, env): diff --git a/tests/test_get_superclass.py b/tests/test_get_superclass.py new file mode 100644 index 0000000..71d8f88 --- /dev/null +++ b/tests/test_get_superclass.py @@ -0,0 +1,43 @@ +"""GetSuperclass should use jvm_super, not Python __mro__.""" +import os +import sys +import unittest + +sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', 'src')) + +from androidemu.java.java_class_def import JavaClassDef +from androidemu.java.jni_env import JNIEnv + + +class Animal(metaclass=JavaClassDef, jvm_name='demo/Animal'): + pass + + +class Dog(metaclass=JavaClassDef, jvm_name='demo/Dog', jvm_super=Animal): + pass + + +class TestGetSuperclass(unittest.TestCase): + def test_jvm_super_not_mro(self): + # Python MRO parent is object; Java parent is Animal + self.assertIs(Dog.__mro__[1], object) + self.assertIs(Dog.jvm_super, Animal) + + self.assertIs(JNIEnv._java_superclass(Dog), Animal) + self.assertIsNone(JNIEnv._java_superclass(Animal)) + + def test_old_mro_path_would_be_wrong(self): + # What the old get_superclass returned via __mro__[1] + self.assertIs(Dog.__mro__[1], object) + self.assertIsNot(Dog.__mro__[1], Animal) + + def test_invalid_jvm_super_treated_as_none(self): + class Broken(metaclass=JavaClassDef, jvm_name='demo/Broken'): + pass + + Broken.jvm_super = 'not-a-class' + self.assertIsNone(JNIEnv._java_superclass(Broken)) + + +if __name__ == '__main__': + unittest.main()