You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by em...@apache.org on 2025/03/20 22:32:05 UTC
(groovy) branch GROOVY-11568 updated (38ca874faf -> 63bfb66712)
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a change to branch GROOVY-11568
in repository https://gitbox.apache.org/repos/asf/groovy.git
discard 38ca874faf GROOVY-11568: try `invokeMethod(Class,Object,Object[],boolean,boolean)`
add 3d33b82028 GROOVY-11548: add test case
add 43ddc4b357 GROOVY-11548: default method does not override superclass `final` method
add acf0efc8bf Bump com.gradle.develocity from 3.18.2 to 3.19.2
add f340e1aa9b GROOVY-11570: Groovy 4/5 not working in OSGi container
add c7800e8b61 GROOVY-11572: STC: spread on non-iterable type
add 6fd3b7ea17 GROOVY-11573: propagate parameters configuration to java compiler
add c471e5dd3e add license
add d41ba38077 GROOVY-11574: Bump junit5/junit5platform to 5.12.0/1.12.0
add 0f6bd302a4 GROOVY-11575: Bump gradle to 8.12.1 (build dependency)
add bedde41f0d bump dependency metadata
add 3879953303 tweak wording
add 43d4f9308b GROOVY-11577: Add withIndex/indexed methods for ArrayGroovyMethods
add fc776ff11b GROOVY-11579: skip bridge method in final method override checking
add a3c5939497 GROOVY-11550: check method for name clash (same erasure, different type)
add 0359be36eb GROOVY-11581: despread array without converting inner array to list
add 9673c664aa GROOVY-11182: add test case
add c0bc2d3fb9 move `useJUnitPlatform()` to the `org.apache.groovy-tested` plugin
add 8141efd4e6 GROOVY-4843, GROOVY-8560: box primitive array for spread invocation
add 6371978287 move test
add 4baefde7ae minor items
add 40095eca7e minor items
add 83e6c6c6fd GROOVY-11582: remove excess manifest attributes (pre-work: formatting and minor refactoring)
add a2ddf98c35 update link to JDK 25
add 8afdc309ba Checkstyle 10.21.4
new 63bfb66712 GROOVY-11568: try `invokeMethod(Class,Object,Object[],boolean,boolean)`
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (38ca874faf)
\
N -- N -- N refs/heads/GROOVY-11568 (63bfb66712)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/groovy-build-test.yml | 4 +-
.../src/main/groovy/org.apache.groovy-base.gradle | 69 +++----
.../src/main/groovy/org.apache.groovy-core.gradle | 16 +-
.../main/groovy/org.apache.groovy-library.gradle | 22 +--
.../groovy/org.apache.groovy-performance.gradle | 10 +-
.../main/groovy/org.apache.groovy-tested.gradle | 55 +++---
.../groovy/gradle/GroovyLibraryExtension.groovy | 56 +++---
.../org/apache/groovy/gradle/JarJarTask.groovy | 150 +++++++--------
build.gradle | 58 +++---
gradle.properties | 2 +-
gradle/verification-metadata.xml | 21 +--
gradle/wrapper/gradle-wrapper.properties | 2 +-
gradlew | 3 +-
settings.gradle | 2 +-
.../apache/groovy/ast/tools/ClassNodeUtils.java | 16 +-
.../apache/groovy/ast/tools/MethodNodeUtils.java | 48 +++--
.../codehaus/groovy/ast/tools/GenericsUtils.java | 2 +-
.../groovy/classgen/ClassCompletionVerifier.java | 109 +++++++++--
.../org/codehaus/groovy/classgen/EnumVisitor.java | 2 +-
.../org/codehaus/groovy/classgen/Verifier.java | 38 ++--
.../codehaus/groovy/control/ResolveVisitor.java | 22 ++-
.../groovy/runtime/ArrayGroovyMethods.java | 203 ++++++++++++++++++++-
.../groovy/runtime/DefaultGroovyMethods.java | 2 +-
.../groovy/runtime/ScriptBytecodeAdapter.java | 6 +-
.../codehaus/groovy/tools/FileSystemCompiler.java | 18 +-
.../transform/stc/StaticTypeCheckingVisitor.java | 5 +-
.../transform/trait/TraitASTTransformation.java | 2 +
.../groovy/transform/trait/TraitComposer.java | 7 +-
.../codehaus/groovy/transform/trait/Traits.java | 16 +-
...gArrayIterable.java => FloatArrayIterable.java} | 14 +-
.../org/codehaus/groovy/vmplugin/v8/Selector.java | 35 ++--
src/spec/doc/core-metaprogramming.adoc | 8 +-
src/test/gls/innerClass/InnerClassTest.groovy | 46 ++++-
src/test/gls/invocation/CovariantReturnTest.groovy | 36 +++-
src/test/groovy/OverrideTest.groovy | 34 ++++
src/test/groovy/SpreadArgTest.groovy | 17 +-
src/test/groovy/bugs/Groovy10236.groovy | 4 +-
src/test/groovy/bugs/Groovy10281.groovy | 2 +-
src/test/groovy/bugs/Groovy10305.groovy | 2 +-
src/test/groovy/bugs/Groovy10381.groovy | 2 +-
.../bugs/{Groovy8948.groovy => Groovy11182.groovy} | 15 +-
src/test/groovy/bugs/Groovy11272.groovy | 2 +-
src/test/groovy/bugs/Groovy11292.groovy | 2 +-
src/test/groovy/bugs/Groovy11293.groovy | 2 +-
src/test/groovy/bugs/Groovy11568.groovy | 2 +-
.../test/groovy/lang/NamedValueTest.groovy | 5 +-
.../groovy/mock/interceptor/MockForJavaTest.groovy | 38 +++-
.../groovy/operator/SpreadListOperatorTest.groovy | 4 +-
.../stc/ArraysAndCollectionsSTCTest.groovy | 8 +
.../groovy/transform/stc/MethodCallsSTCTest.groovy | 9 +
.../asm/sc/StaticCompilationTestSupport.groovy | 19 +-
.../transform/TupleConstructorTransformTest.groovy | 4 +-
.../groovy/transform/traitx/Groovy10218.groovy | 3 +-
.../groovy/transform/traitx/Groovy11508.groovy | 3 +-
.../groovy/transform/traitx/Groovy6697Bug.groovy | 153 ----------------
.../transform/traitx/Groovy7196SupportTrait.groovy | 3 +
.../traitx/Groovy7196SupportTraitImpl.groovy | 22 ---
.../groovy/transform/traitx/Groovy7215Bug.groovy | 47 -----
.../transform/traitx/Groovy7215SupportTrait.groovy | 13 +-
.../groovy/transform/traitx/Groovy7275Bug.groovy | 47 -----
.../groovy/transform/traitx/Groovy7285Bug.groovy | 64 -------
.../groovy/transform/traitx/Groovy7926.groovy | 56 ------
.../groovy/transform/traitx/Groovy_6697.groovy | 183 +++++++++++++++++++
.../{Groovy6736Bug.groovy => Groovy_6736.groovy} | 25 ++-
.../{Groovy6741Bug.groovy => Groovy_6741.groovy} | 10 +-
.../{Groovy7011Bug.groovy => Groovy_7011.groovy} | 13 +-
.../{Groovy7190Bug.groovy => Groovy_7190.groovy} | 12 +-
.../{Groovy7196Bug.groovy => Groovy_7196.groovy} | 15 +-
.../{Groovy7206Bug.groovy => Groovy_7206.groovy} | 38 ++--
.../groovy/transform/traitx/Groovy_7215.groovy} | 48 +++--
.../{Groovy7217Bug.groovy => Groovy_7217.groovy} | 14 +-
.../{Groovy7269Bug.groovy => Groovy_7269.groovy} | 36 ++--
.../groovy/transform/traitx/Groovy_7275.groovy} | 29 ++-
.../groovy/transform/traitx/Groovy_7285.groovy | 66 +++++++
.../{Groovy7456Bug.groovy => Groovy_7456.groovy} | 11 +-
.../{Groovy7500.groovy => Groovy_7500.groovy} | 4 +-
.../{Groovy7846Bug.groovy => Groovy_7846.groovy} | 20 +-
.../groovy/transform/traitx/Groovy_7926.groovy | 84 +++++++++
.../{Groovy8864.groovy => Groovy_8864.groovy} | 7 +-
.../groovy/transform/traitx/TestTrait2.groovy | 10 +-
.../traitx/TraitASTTransformationTest.groovy | 27 ++-
.../traitx/TraitWithClosureOrLambda.groovy | 2 +-
.../codehaus/groovy/util/HashCodeHelperTest.groovy | 5 +-
.../codehaus/groovy/util/ListHashMapTest.groovy | 22 ++-
.../util/ManagedConcurrentLinkedQueueTest.groovy | 24 ++-
.../util/ManagedConcurrentValueMapTest.groovy | 7 +-
.../groovy/util/ReferenceManagerTest.groovy | 21 ++-
.../v8/InterfaceStaticMethodCallTest.groovy | 9 +-
.../v8/PluginDefaultGroovyMethodsSCTest.groovy | 26 ---
.../v8/PluginDefaultGroovyMethodsTest.groovy | 54 ++++--
.../groovy/vmplugin/v9/ClassFinderTest.groovy | 72 ++++----
.../org/codehaus/groovy/ant/GroovycTest.xml | 117 +++++-------
.../org/codehaus/groovy/ant/GroovycTest2.java | 15 +-
...oovycTest2.java => ParameterMetadataCheck.java} | 15 +-
.../org/codehaus/groovy/ant/params.groovy | 2 +-
.../org/codehaus/groovy/ant/GroovycTest.java | 142 +++++++-------
subprojects/groovy-contracts/build.gradle | 7 +-
subprojects/groovy-nio/build.gradle | 3 -
subprojects/groovy-templates/build.gradle | 6 -
subprojects/groovy-test-junit5/build.gradle | 28 ++-
.../src/test/groovy/JUnit5Test.groovy | 2 +-
subprojects/groovy-xml/build.gradle | 6 -
subprojects/groovy-yaml/build.gradle | 2 +-
versions.properties | 29 ++-
104 files changed, 1705 insertions(+), 1250 deletions(-)
copy src/main/java/org/codehaus/groovy/util/{LongArrayIterable.java => FloatArrayIterable.java} (74%)
copy src/test/groovy/bugs/{Groovy8948.groovy => Groovy11182.groovy} (77%)
rename src/{spec => }/test/groovy/lang/NamedValueTest.groovy (96%)
delete mode 100644 src/test/org/codehaus/groovy/transform/traitx/Groovy6697Bug.groovy
delete mode 100644 src/test/org/codehaus/groovy/transform/traitx/Groovy7196SupportTraitImpl.groovy
delete mode 100644 src/test/org/codehaus/groovy/transform/traitx/Groovy7215Bug.groovy
delete mode 100644 src/test/org/codehaus/groovy/transform/traitx/Groovy7275Bug.groovy
delete mode 100644 src/test/org/codehaus/groovy/transform/traitx/Groovy7285Bug.groovy
delete mode 100644 src/test/org/codehaus/groovy/transform/traitx/Groovy7926.groovy
create mode 100644 src/test/org/codehaus/groovy/transform/traitx/Groovy_6697.groovy
rename src/test/org/codehaus/groovy/transform/traitx/{Groovy6736Bug.groovy => Groovy_6736.groovy} (68%)
rename src/test/org/codehaus/groovy/transform/traitx/{Groovy6741Bug.groovy => Groovy_6741.groovy} (91%)
rename src/test/org/codehaus/groovy/transform/traitx/{Groovy7011Bug.groovy => Groovy_7011.groovy} (94%)
rename src/test/org/codehaus/groovy/transform/traitx/{Groovy7190Bug.groovy => Groovy_7190.groovy} (89%)
rename src/test/org/codehaus/groovy/transform/traitx/{Groovy7196Bug.groovy => Groovy_7196.groovy} (81%)
rename src/test/org/codehaus/groovy/transform/traitx/{Groovy7206Bug.groovy => Groovy_7206.groovy} (79%)
copy src/test/{groovy/bugs/Groovy10466.groovy => org/codehaus/groovy/transform/traitx/Groovy_7215.groovy} (55%)
rename src/test/org/codehaus/groovy/transform/traitx/{Groovy7217Bug.groovy => Groovy_7217.groovy} (88%)
rename src/test/org/codehaus/groovy/transform/traitx/{Groovy7269Bug.groovy => Groovy_7269.groovy} (74%)
copy src/test/{groovy/bugs/Groovy9226.groovy => org/codehaus/groovy/transform/traitx/Groovy_7275.groovy} (65%)
create mode 100644 src/test/org/codehaus/groovy/transform/traitx/Groovy_7285.groovy
rename src/test/org/codehaus/groovy/transform/traitx/{Groovy7456Bug.groovy => Groovy_7456.groovy} (89%)
rename src/test/org/codehaus/groovy/transform/traitx/{Groovy7500.groovy => Groovy_7500.groovy} (95%)
rename src/test/org/codehaus/groovy/transform/traitx/{Groovy7846Bug.groovy => Groovy_7846.groovy} (84%)
create mode 100644 src/test/org/codehaus/groovy/transform/traitx/Groovy_7926.groovy
rename src/test/org/codehaus/groovy/transform/traitx/{Groovy8864.groovy => Groovy_8864.groovy} (91%)
delete mode 100644 src/test/org/codehaus/groovy/vmplugin/v8/PluginDefaultGroovyMethodsSCTest.groovy
copy subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/{GroovycTest2.java => ParameterMetadataCheck.java} (72%)
copy src/test-resources/core/GString_06.groovy => subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/params.groovy (96%)
(groovy) 01/01: GROOVY-11568: try `invokeMethod(Class,Object,Object[],boolean,boolean)`
Posted by em...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch GROOVY-11568
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 63bfb667122dc1c8df5029034a0238adbd439f75
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Sun Feb 16 20:25:26 2025 -0600
GROOVY-11568: try `invokeMethod(Class,Object,Object[],boolean,boolean)`
---
.../groovy/runtime/metaclass/ClosureMetaClass.java | 2 +-
.../v8/IndyGuardsFiltersAndSignatures.java | 66 ++++++++++-----------
.../org/codehaus/groovy/vmplugin/v8/Selector.java | 25 +++++++-
src/test/groovy/bugs/Groovy11568.groovy | 67 ++++++++++++++++++++++
4 files changed, 123 insertions(+), 37 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/runtime/metaclass/ClosureMetaClass.java b/src/main/java/org/codehaus/groovy/runtime/metaclass/ClosureMetaClass.java
index 2d7332d332..479c6b20e9 100644
--- a/src/main/java/org/codehaus/groovy/runtime/metaclass/ClosureMetaClass.java
+++ b/src/main/java/org/codehaus/groovy/runtime/metaclass/ClosureMetaClass.java
@@ -365,7 +365,7 @@ public final class ClosureMetaClass extends MetaClassImpl {
}
Class thisType = sender;
while (GeneratedClosure.class.isAssignableFrom(thisType)) thisType = thisType.getEnclosingClass();
- if (thisType != sender && thisType != object.getClass() && thisType.isInstance(object)) { // GROOVY-2433, GROOVY-11128
+ if (thisType != object.getClass() && thisType.isInstance(object)) { // GROOVY-2433, GROOVY-11128
try {
return ((GroovyObject) object).getMetaClass().invokeMethod(thisType, object, methodName, arguments, false, true);
} catch (GroovyRuntimeException gre) {
diff --git a/src/main/java/org/codehaus/groovy/vmplugin/v8/IndyGuardsFiltersAndSignatures.java b/src/main/java/org/codehaus/groovy/vmplugin/v8/IndyGuardsFiltersAndSignatures.java
index db2d6307bc..a992f38c21 100644
--- a/src/main/java/org/codehaus/groovy/vmplugin/v8/IndyGuardsFiltersAndSignatures.java
+++ b/src/main/java/org/codehaus/groovy/vmplugin/v8/IndyGuardsFiltersAndSignatures.java
@@ -56,15 +56,14 @@ public class IndyGuardsFiltersAndSignatures {
private static final MethodType
OBJECT_FILTER = MethodType.methodType(Object.class, Object.class),
- OBJECT_GUARD = MethodType.methodType(boolean.class, Object.class),
- INVOKER = MethodType.methodType(Object.class, Object.class, String.class, Object[].class);
+ OBJECT_GUARD = MethodType.methodType(boolean.class, Object.class);
protected static final MethodHandle
SAME_CLASS, SAME_CLASSES, SAME_MC, IS_NULL, NON_NULL,
UNWRAP_METHOD, UNWRAP_EXCEPTION,
HAS_CATEGORY_IN_CURRENT_THREAD_GUARD,
- META_METHOD_INVOKER, GROOVY_OBJECT_INVOKER, GROOVY_OBJECT_GET_PROPERTY,
- META_CLASS_INVOKE_STATIC_METHOD,
+ GROOVY_OBJECT_INVOKER, GROOVY_OBJECT_GET_PROPERTY,META_METHOD_INVOKER,
+ META_CLASS_INVOKE_METHOD, META_CLASS_INVOKE_STATIC_METHOD,
BEAN_CONSTRUCTOR_PROPERTY_SETTER,
META_PROPERTY_GETTER,
SLOW_META_CLASS_FIND,
@@ -78,35 +77,36 @@ public class IndyGuardsFiltersAndSignatures {
static {
try {
- SAME_CLASS = LOOKUP.findStatic(IndyGuardsFiltersAndSignatures.class, "sameClass", MethodType.methodType(boolean.class, Class.class, Object.class));
- SAME_CLASSES = LOOKUP.findStatic(IndyGuardsFiltersAndSignatures.class, "sameClasses", MethodType.methodType(boolean.class, Class[].class, Object[].class));
- SAME_MC = LOOKUP.findStatic(IndyGuardsFiltersAndSignatures.class, "isSameMetaClass", MethodType.methodType(boolean.class, MetaClass.class, Object.class));
- IS_NULL = LOOKUP.findStatic(IndyGuardsFiltersAndSignatures.class, "isNull", OBJECT_GUARD);
- NON_NULL = LOOKUP.findStatic(Objects.class, "nonNull", MethodType.methodType(boolean.class, Object.class));
- UNWRAP_METHOD = LOOKUP.findStatic(IndyGuardsFiltersAndSignatures.class, "unwrap", OBJECT_FILTER);
- UNWRAP_EXCEPTION = LOOKUP.findStatic(IndyGuardsFiltersAndSignatures.class, "unwrap", MethodType.methodType(Object.class, GroovyRuntimeException.class));
- HAS_CATEGORY_IN_CURRENT_THREAD_GUARD = LOOKUP.findStatic(GroovyCategorySupport.class, "hasCategoryInCurrentThread", MethodType.methodType(boolean.class));
- META_METHOD_INVOKER = LOOKUP.findVirtual(MetaMethod.class, "doMethodInvoke", MethodType.methodType(Object.class, Object.class, Object[].class));
- GROOVY_OBJECT_INVOKER = LOOKUP.findStatic(IndyGuardsFiltersAndSignatures.class, "invokeGroovyObjectInvoker", INVOKER.insertParameterTypes(0, MissingMethodException.class));
- GROOVY_OBJECT_GET_PROPERTY = LOOKUP.findVirtual(GroovyObject.class, "getProperty", MethodType.methodType(Object.class, String.class));
- META_CLASS_INVOKE_STATIC_METHOD = LOOKUP.findVirtual(MetaObjectProtocol.class, "invokeStaticMethod", INVOKER);
- BEAN_CONSTRUCTOR_PROPERTY_SETTER = LOOKUP.findStatic(IndyGuardsFiltersAndSignatures.class, "setBeanProperties", MethodType.methodType(Object.class, MetaClass.class, Object.class, Map.class));
- META_PROPERTY_GETTER = LOOKUP.findVirtual(MetaProperty.class, "getProperty", OBJECT_FILTER);
- SLOW_META_CLASS_FIND = LOOKUP.findStatic(InvokerHelper.class, "getMetaClass", MethodType.methodType(MetaClass.class, Object.class));
- MOP_GET = LOOKUP.findVirtual(MetaObjectProtocol.class, "getProperty", MethodType.methodType(Object.class, Object.class, String.class));
- MOP_INVOKE_CONSTRUCTOR = LOOKUP.findVirtual(MetaObjectProtocol.class, "invokeConstructor", MethodType.methodType(Object.class, Object[].class));
- MOP_INVOKE_METHOD = LOOKUP.findVirtual(MetaObjectProtocol.class, "invokeMethod", INVOKER);
- INTERCEPTABLE_INVOKER = LOOKUP.findVirtual(GroovyObject.class, "invokeMethod", MethodType.methodType(Object.class, String.class, Object.class));
-
- BOOLEAN_IDENTITY = MethodHandles.identity(Boolean.class);
- CLASS_FOR_NAME = LOOKUP.findStatic(Class.class, "forName", MethodType.methodType(Class.class, String.class, boolean.class, ClassLoader.class));
- DTT_CAST_TO_TYPE = LOOKUP.findStatic(DefaultTypeTransformation.class, "castToType", MethodType.methodType(Object.class, Object.class, Class.class));
- SAM_CONVERSION = LOOKUP.findStatic(CachedSAMClass.class, "coerceToSAM", MethodType.methodType(Object.class, Closure.class, Method.class, Class.class));
- HASHSET_CONSTRUCTOR = LOOKUP.findConstructor(HashSet.class, MethodType.methodType(void.class, Collection.class));
- ARRAYLIST_CONSTRUCTOR = LOOKUP.findConstructor(ArrayList.class, MethodType.methodType(void.class, Collection.class));
- GROOVY_CAST_EXCEPTION = LOOKUP.findConstructor(GroovyCastException.class, MethodType.methodType(void.class, Object.class, Class.class));
-
- EQUALS = LOOKUP.findVirtual(Object.class, "equals", OBJECT_GUARD);
+ SAME_CLASS = LOOKUP.findStatic (IndyGuardsFiltersAndSignatures.class, "sameClass", MethodType.methodType(boolean.class, Class.class, Object.class));
+ SAME_CLASSES = LOOKUP.findStatic (IndyGuardsFiltersAndSignatures.class, "sameClasses", MethodType.methodType(boolean.class, Class[].class, Object[].class));
+ SAME_MC = LOOKUP.findStatic (IndyGuardsFiltersAndSignatures.class, "isSameMetaClass", MethodType.methodType(boolean.class, MetaClass.class, Object.class));
+ IS_NULL = LOOKUP.findStatic (IndyGuardsFiltersAndSignatures.class, "isNull", OBJECT_GUARD);
+ NON_NULL = LOOKUP.findStatic (Objects.class, "nonNull", MethodType.methodType(boolean.class, Object.class));
+ UNWRAP_METHOD = LOOKUP.findStatic (IndyGuardsFiltersAndSignatures.class, "unwrap", OBJECT_FILTER);
+ UNWRAP_EXCEPTION = LOOKUP.findStatic (IndyGuardsFiltersAndSignatures.class, "unwrap", MethodType.methodType(Object.class, GroovyRuntimeException.class));
+ HAS_CATEGORY_IN_CURRENT_THREAD_GUARD = LOOKUP.findStatic (GroovyCategorySupport.class, "hasCategoryInCurrentThread", MethodType.methodType(boolean.class));
+ GROOVY_OBJECT_INVOKER = LOOKUP.findStatic (IndyGuardsFiltersAndSignatures.class, "invokeGroovyObjectInvoker", MethodType.methodType(Object.class, MissingMethodException.class, Object.class, String.class, Object[].class));
+ GROOVY_OBJECT_GET_PROPERTY = LOOKUP.findVirtual(GroovyObject.class, "getProperty", MethodType.methodType(Object.class, String.class));
+ META_METHOD_INVOKER = LOOKUP.findVirtual(MetaMethod.class, "doMethodInvoke", MethodType.methodType(Object.class, Object.class, Object[].class));
+ META_CLASS_INVOKE_METHOD = LOOKUP.findVirtual(MetaClass.class, "invokeMethod", MethodType.methodType(Object.class, Class.class, Object.class, String.class, Object[].class, boolean.class, boolean.class));
+ META_CLASS_INVOKE_STATIC_METHOD = LOOKUP.findVirtual(MetaObjectProtocol.class, "invokeStaticMethod", MethodType.methodType(Object.class, Object.class, String.class, Object[].class));
+ BEAN_CONSTRUCTOR_PROPERTY_SETTER = LOOKUP.findStatic (IndyGuardsFiltersAndSignatures.class, "setBeanProperties", MethodType.methodType(Object.class, MetaClass.class, Object.class, Map.class));
+ META_PROPERTY_GETTER = LOOKUP.findVirtual(MetaProperty.class, "getProperty", OBJECT_FILTER);
+ SLOW_META_CLASS_FIND = LOOKUP.findStatic (InvokerHelper.class, "getMetaClass", MethodType.methodType(MetaClass.class, Object.class));
+ MOP_GET = LOOKUP.findVirtual(MetaObjectProtocol.class, "getProperty", MethodType.methodType(Object.class, Object.class, String.class));
+ MOP_INVOKE_CONSTRUCTOR = LOOKUP.findVirtual(MetaObjectProtocol.class, "invokeConstructor", MethodType.methodType(Object.class, Object[].class));
+ MOP_INVOKE_METHOD = LOOKUP.findVirtual(MetaObjectProtocol.class, "invokeMethod", MethodType.methodType(Object.class, Object.class, String.class, Object[].class));
+ INTERCEPTABLE_INVOKER = LOOKUP.findVirtual(GroovyObject.class, "invokeMethod", MethodType.methodType(Object.class, String.class, Object.class));
+
+ BOOLEAN_IDENTITY = MethodHandles.identity(Boolean.class);
+ CLASS_FOR_NAME = LOOKUP.findStatic(Class.class, "forName", MethodType.methodType(Class.class, String.class, boolean.class, ClassLoader.class));
+ DTT_CAST_TO_TYPE = LOOKUP.findStatic(DefaultTypeTransformation.class, "castToType", MethodType.methodType(Object.class, Object.class, Class.class));
+ SAM_CONVERSION = LOOKUP.findStatic(CachedSAMClass.class, "coerceToSAM", MethodType.methodType(Object.class, Closure.class, Method.class, Class.class));
+ HASHSET_CONSTRUCTOR = LOOKUP.findConstructor(HashSet.class, MethodType.methodType(void.class, Collection.class));
+ ARRAYLIST_CONSTRUCTOR = LOOKUP.findConstructor(ArrayList.class, MethodType.methodType(void.class, Collection.class));
+ GROOVY_CAST_EXCEPTION = LOOKUP.findConstructor(GroovyCastException.class, MethodType.methodType(void.class, Object.class, Class.class));
+
+ EQUALS = LOOKUP.findVirtual(Object.class, "equals", OBJECT_GUARD);
} catch (Exception e) {
throw new GroovyBugError(e);
}
diff --git a/src/main/java/org/codehaus/groovy/vmplugin/v8/Selector.java b/src/main/java/org/codehaus/groovy/vmplugin/v8/Selector.java
index b9da452a7e..59bd28fb56 100644
--- a/src/main/java/org/codehaus/groovy/vmplugin/v8/Selector.java
+++ b/src/main/java/org/codehaus/groovy/vmplugin/v8/Selector.java
@@ -79,6 +79,7 @@ import static org.codehaus.groovy.vmplugin.v8.IndyGuardsFiltersAndSignatures.HAS
import static org.codehaus.groovy.vmplugin.v8.IndyGuardsFiltersAndSignatures.HAS_CATEGORY_IN_CURRENT_THREAD_GUARD;
import static org.codehaus.groovy.vmplugin.v8.IndyGuardsFiltersAndSignatures.INTERCEPTABLE_INVOKER;
import static org.codehaus.groovy.vmplugin.v8.IndyGuardsFiltersAndSignatures.IS_NULL;
+import static org.codehaus.groovy.vmplugin.v8.IndyGuardsFiltersAndSignatures.META_CLASS_INVOKE_METHOD;
import static org.codehaus.groovy.vmplugin.v8.IndyGuardsFiltersAndSignatures.META_CLASS_INVOKE_STATIC_METHOD;
import static org.codehaus.groovy.vmplugin.v8.IndyGuardsFiltersAndSignatures.META_METHOD_INVOKER;
import static org.codehaus.groovy.vmplugin.v8.IndyGuardsFiltersAndSignatures.META_PROPERTY_GETTER;
@@ -727,6 +728,14 @@ public abstract class Selector {
return targetType;
}
+ private Method metaClassMethod(String name, Class... signature) {
+ try {
+ return mc.getClass().getMethod(name, signature);
+ } catch (ReflectiveOperationException e) {
+ throw new GroovyBugError(e);
+ }
+ }
+
/**
* Creates a MethodHandle, which will use the metaclass path.
* This method is called only if no handle has been created before. This
@@ -741,9 +750,19 @@ public abstract class Selector {
handle = META_CLASS_INVOKE_STATIC_METHOD.bindTo(mc);
if (LOG_ENABLED) LOG.info("use invokeStaticMethod with bound meta class");
} else {
- handle = MOP_INVOKE_METHOD.bindTo(mc);
- if (LOG_ENABLED) LOG.info("use invokeMethod with bound meta class");
-
+ if (standardMetaClass
+// || metaClassMethod("invokeMethod", Object.class, String.class, Object[].class).getDeclaringClass()
+// == metaClassMethod("invokeMethod", Class.class, Object.class, String.class, Object[].class, boolean.class, boolean.class).getDeclaringClass()
+ ) {
+ // GROOVY-11568: use MetaClass#invokeMethod(Class,Object,Object[],boolean,boolean)
+ handle = META_CLASS_INVOKE_METHOD;
+ handle = handle.bindTo(mc).bindTo(sender);
+ handle = MethodHandles.insertArguments(handle, 3, Boolean.FALSE, Boolean.FALSE);
+ if (LOG_ENABLED) LOG.info("use invokeMethod with bound meta class and sender class");
+ } else {
+ handle = MOP_INVOKE_METHOD.bindTo(mc);
+ if (LOG_ENABLED) LOG.info("use invokeMethod with bound meta class");
+ }
if (receiver instanceof GroovyObject) {
// if the metaclass call fails we may still want to fall back to call
// GroovyObject#invokeMethod if the receiver is a GroovyObject
diff --git a/src/test/groovy/bugs/Groovy11568.groovy b/src/test/groovy/bugs/Groovy11568.groovy
new file mode 100644
index 0000000000..a9b9405c5e
--- /dev/null
+++ b/src/test/groovy/bugs/Groovy11568.groovy
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package groovy.bugs
+
+import org.junit.jupiter.api.Test
+
+import static groovy.test.GroovyAssert.assertScript
+
+final class Groovy11568 {
+ @Test
+ void testPrivateMethodWithCustomMetaClass() {
+ assertScript '''
+ class CMC extends MetaClassImpl {
+ CMC(Class theClass) {
+ super(theClass)
+ }
+ @Override
+ Object invokeMethod(Object object, String methodName, Object arguments) {
+ super.invokeMethod(object, methodName, arguments)
+ }
+ @Override
+ Object invokeMethod(Object object, String methodName, Object[] originalArguments) {
+ super.invokeMethod(object, methodName, originalArguments)
+ }
+ @Override
+ Object invokeMethod(Class sender, Object object, String methodName, Object[] arguments, boolean isCallToSuper, boolean fromInsideClass) {
+ super.invokeMethod(sender, object, methodName, arguments, isCallToSuper, fromInsideClass)
+ }
+ }
+
+ class C {
+ def publicMethod() {
+ privateMethod()
+ }
+ private privateMethod() {
+ 'C#privateMethod()'
+ }
+ }
+
+ class D extends C {
+ }
+
+ def cmc = new CMC(D.class)
+ cmc.initialize()
+ def obj = new D()
+ obj.setMetaClass(cmc)
+ def str = obj.publicMethod()
+ assert str == 'C#privateMethod()'
+ '''
+ }
+}