GROOVY-12387: Indy: exception-handler combinator bypassed on ART - #2909
Merged
Merged
Conversation
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## master #2909 +/- ##
==================================================
- Coverage 71.1943% 71.1867% -0.0076%
- Complexity 37632 37681 +49
==================================================
Files 1581 1584 +3
Lines 136251 136385 +134
Branches 25311 25340 +29
==================================================
+ Hits 97003 97088 +85
- Misses 30511 30538 +27
- Partials 8737 8759 +22
🚀 New features to boost your workflow:
|
paulk-asert
force-pushed
the
groovy12387
branch
from
September 9, 2026 08:46
afe6359 to
90e84a3
Compare
Contributor
There was a problem hiding this comment.
Warning
Copilot couldn't run its full agentic review because it didn't start before the timeout. Make sure your repository has a runner available, or add a copilot-code-review.yml file specifying one with the runs-on attribute. See the docs for more details.
Pull request overview
Adds an Android (ART) compatibility path for MethodHandles.catchException behavior so Indy call-site exception handling matches HotSpot/JDK semantics (GROOVY-12387), including for subclass exceptions (e.g., Groovy “no-stack” exceptions).
Changes:
- Introduce
IndyCatchCompatwrappers for GroovyObject fallback and GroovyRuntimeException unwrapping on Android. - Switch
Selectorto use the wrappers whenAndroidSupport.isRunningAndroid()is true. - Add a dedicated test suite validating fallback + unwrapping semantics and call-site type preservation.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 4 comments.
| File | Description |
|---|---|
| src/test/groovy/org/codehaus/groovy/vmplugin/v8/IndyCatchCompatTest.groovy | Adds tests covering ART compatibility wrappers (fallback + unwrapping) and method-handle type behavior. |
| src/main/java/org/codehaus/groovy/vmplugin/v8/Selector.java | Routes exception handling to IndyCatchCompat only on Android to avoid ART’s exact-class catch behavior. |
| src/main/java/org/codehaus/groovy/vmplugin/v8/IndyCatchCompat.java | Implements plain-Java exception handling wrappers that are resilient to subclass exceptions on ART. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Comment on lines
+44
to
+45
| * on Android; on a JVM the | ||
| * combinator stays, so this class is not loaded there. |
| return INVOKE_UNWRAPPING.bindTo(spread).asCollector(Object[].class, arity).asType(type); | ||
| } | ||
|
|
||
| static Object invokeWithFallback(final MethodHandle target, final Object receiver, final String name, final Object[] args) throws Throwable { |
| } | ||
| } | ||
|
|
||
| static Object invokeUnwrapping(final MethodHandle target, final Object[] args) throws Throwable { |
Comment on lines
+1172
to
+1174
| handle = AndroidSupport.isRunningAndroid() | ||
| ? IndyCatchCompat.withGroovyObjectFallback(handle) // GROOVY-12387 | ||
| : MethodHandles.catchException(handle, MissingMethodException.class, GROOVY_OBJECT_INVOKER); |
This comment has been minimized.
This comment has been minimized.
paulk-asert
force-pushed
the
groovy12387
branch
from
September 9, 2026 23:04
90e84a3 to
9802a1a
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.