Painless: Fix bug for static method calls on interfaces #31348
Conversation
jdconrad
added
>bug
:Core/Infra/Scripting
|
Pinging @elastic/es-core-infra |
| type = owner.type; | ||
| } | ||
|
|
||
| if (java.lang.reflect.Modifier.isStatic(modifiers)) { | ||
| writer.invokeStatic(type, method); | ||
| } else if (java.lang.reflect.Modifier.isInterface(owner.clazz.getModifiers())) { | ||
| // special case for interfaces where the interface function needs to be set to true |
There was a problem hiding this comment.
I think this'd be more clear if you said something like "invokeStatic assumes that it is not invoking a method on an interface."
There was a problem hiding this comment.
Agreed. Cleaned up a bit.
| @@ -66,6 +66,9 @@ | |||
| /** delegate method type method as type */ | |||
| public final Type delegateType; | |||
|
|
|||
| /** whether a call is made on a delegate interface */ | |||
| public final int isDelegateInterface; | |||
There was a problem hiding this comment.
I wonder if it'd be worth making this a boolean for readability. I'm fine with it staying an integer if you like but I think it is worth a comment why it is an integer and that it can only be 0 or 1.
There was a problem hiding this comment.
Fixed and commented.
| } else if (delegateMethod.augmentation != null) { | ||
| delegateClassName = delegateMethod.augmentation.getName(); | ||
| isDelegateInterface = delegateMethod.augmentation.isInterface() ? 1 : 0; |
There was a problem hiding this comment.
This'd only come up if the target augmentation method is defined on an interface, right? Maybe we should not allow that at all.
There was a problem hiding this comment.
Agreed, but I'd like to do that in a follow up PR as we discussed.
There was a problem hiding this comment.
I think we should forbid augmentation methods on interfaces. That just feels so weird. And we can't make a test case for it anyway. But maybe that should be in a followup?
I think you should add a test for method references to static methods on an interface. Once you do that, merge away!
|
@nik9000 Thanks for the fast turn around on this review! Added a test for method references triggering an invokeStatic through lambdaBootstrap and fixed up a couple things based on your comments. |
|
Will commit this as soon as it passes CI |
Static method calls on interfaces were not being called correctly which was causing JVM crashes. This change fixes the issue.
Static method calls on interfaces were not being called correctly which was causing JVM crashes. This change fixes the issue.
* master: 992c788 Uncouple persistent task state and status (#31031) 8c6ee7d Describe how to add a plugin in Dockerfile (#31340) 1c5cec0 Remove http status code maps (#31350) 87a676e Do not set vm.max_map_count when unnecessary (#31285) e5b7137 TEST: getCapturedRequestsAndClear should be atomic (#31312) 0324103 Painless: Fix bug for static method calls on interfaces (#31348) d6d0727 QA: Fix resolution of default distribution (#31351) fcf1e41 Extract common http logic to server (#31311) 6dd81ea Build: Fix the license in the pom zip and tar (#31336) 8f886cd Treat ack timeout more like a publish timeout (#31303) 9b29327 [ML] Add description to ML filters (#31330) f7a0caf SQL: Fix build on Java 10 375d09c [TEST] Fix RemoteClusterClientTests#testEnsureWeReconnect 4877cec More detailed tracing when writing metadata (#31319) bbfe1ec [Tests] Mutualize fixtures code in BaseHttpFixture (#31210)
* 6.x: 6d711fa (origin/6.x, 6.x) Uncouple persistent task state and status (#31031) f0f16b7 [TEST] Make SSL restrictions update atomic (#31050) 652193f Describe how to add a plugin in Dockerfile (#31340) bb568ab TEST: getCapturedRequestsAndClear should be atomic (#31312) 6f94914 Do not set vm.max_map_count when unnecessary (#31285) c12f3c7 Painless: Fix bug for static method calls on interfaces (#31348) 21128e2 QA: Fix resolution of default distribution (#31351) df17a83 Build: Fix the license in the pom zip and tar (#31336) 3e76b15 Treat ack timeout more like a publish timeout (#31303)
We were not calling static interface methods correctly leading to errors. Java 8 didn't care, but Java 9+ is stricter. Example --
java.lang.IncompatibleClassChangeError: Method java.util.Comparator.comparing(Ljava/util/function/Function;)Ljava/util/Comparator; must be InterfaceMethodref constantStackOverflow explanation -- (https://stackoverflow.com/questions/34360718/invokestatic-on-static-method-in-interface?utm_medium=organic&utm_source=google_rich_qa&utm_campaign=google_rich_qa)