mirror of
https://github.com/corda/corda.git
synced 2025-01-07 13:38:47 +00:00
866c057f0d
getDeclaredMethods was returning methods which were inherited from interfaces but not (re)declared in the class itself, due to the VM's internal use of VMClass.methodTable differing from its role in reflection. For reflection, we must only include the declared methods, not the inherited but un-redeclared ones. Previously, we saved the original method table in ClassAddendum.methodTable before creating a new one which contains both declared and inherited methods. That wasted space, so this patch replaces ClassAddendum.methodTable with ClassAddendum.declaredMethodCount, which specifies how many of the methods in VMClass.methodTable were declared in that class. Alternatively, we could ensure that undeclared methods always have their VMMethod.class_ field set to the declaring class instead of the inheriting class. I tried this, but it led to subtle crashes in interface method lookup. The rest of the VM relies not only on VMClass.methodTable containing all inherited interface methods but also that those methods point to the inheriting class, not the declaring class. Changing those assumptions would be a much bigger (and more dangerous in terms of regression potential) effort than I care to take on right now. The solution I chose is a bit ugly, but it's safe. |
||
|---|---|---|
| .. | ||
| avianvmresource | ||
| file | ||
| http | ||
| jar | ||
| Addendum.java | ||
| AnnotationInvocationHandler.java | ||
| Assembler.java | ||
| Atomic.java | ||
| Callback.java | ||
| CallbackReceiver.java | ||
| Cell.java | ||
| ClassAddendum.java | ||
| Classes.java | ||
| ConstantPool.java | ||
| Continuations.java | ||
| FieldAddendum.java | ||
| IncompatibleContinuationException.java | ||
| InnerClassReference.java | ||
| Iso88591.java | ||
| LegacyObjectInputStream.java | ||
| LegacyObjectOutputStream.java | ||
| Machine.java | ||
| MethodAddendum.java | ||
| PersistentSet.java | ||
| Singleton.java | ||
| Stream.java | ||
| SystemClassLoader.java | ||
| Traces.java | ||
| Utf8.java | ||
| VMClass.java | ||
| VMField.java | ||
| VMMethod.java | ||