You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2022/09/05 11:58:49 UTC
[groovy] branch GROOVY-10747 updated: Minor tweak
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY-10747
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/GROOVY-10747 by this push:
new dda9b27889 Minor tweak
dda9b27889 is described below
commit dda9b27889a647673a3b9b8426802a5fdca126b8
Author: Daniel Sun <su...@apache.org>
AuthorDate: Mon Sep 5 19:58:14 2022 +0800
Minor tweak
---
src/main/java/groovy/lang/MetaClassImpl.java | 15 +++----
.../java/org/apache/groovy/runtime/ObjectUtil.java | 34 +++++++++++++--
.../org/codehaus/groovy/runtime/ArrayUtil.java | 51 ++++++++++------------
.../org/codehaus/groovy/runtime/InvokerHelper.java | 1 -
.../org/codehaus/groovy/vmplugin/v8/Selector.java | 4 --
5 files changed, 60 insertions(+), 45 deletions(-)
diff --git a/src/main/java/groovy/lang/MetaClassImpl.java b/src/main/java/groovy/lang/MetaClassImpl.java
index 14ca8081fb..084632192a 100644
--- a/src/main/java/groovy/lang/MetaClassImpl.java
+++ b/src/main/java/groovy/lang/MetaClassImpl.java
@@ -20,6 +20,7 @@ package groovy.lang;
import org.apache.groovy.internal.util.UncheckedThrow;
import org.apache.groovy.lang.GroovyObjectHelper;
+import org.apache.groovy.runtime.ObjectUtil;
import org.apache.groovy.util.BeanUtils;
import org.apache.groovy.util.SystemUtil;
import org.codehaus.groovy.GroovyBugError;
@@ -39,7 +40,6 @@ import org.codehaus.groovy.reflection.ReflectionCache;
import org.codehaus.groovy.reflection.ReflectionUtils;
import org.codehaus.groovy.reflection.android.AndroidSupport;
import org.codehaus.groovy.runtime.ArrayTypeUtils;
-import org.codehaus.groovy.runtime.ArrayUtil;
import org.codehaus.groovy.runtime.ConvertedClosure;
import org.codehaus.groovy.runtime.CurriedClosure;
import org.codehaus.groovy.runtime.DefaultGroovyMethods;
@@ -1128,15 +1128,12 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass {
}
}
- if (receiverClass.isArray()) {
- if (methodName.equals("clone") && arguments.length == 0) {
- try {
- return (Object[]) ArrayUtil.getCloneArrayMethodHandle().invokeExact((Object[]) object);
- } catch (Throwable t) {
- throw new GroovyRuntimeException(t);
- }
+ if (methodName.equals("clone") && arguments.length == 0) {
+ try {
+ return (Object) ObjectUtil.getCloneObjectMethodHandle().invokeExact((Object) object);
+ } catch (Throwable t) {
+ throw new GroovyRuntimeException(t);
}
- throw mme;
}
boolean spyFound = (lookup != null);
diff --git a/src/main/java/org/apache/groovy/runtime/ObjectUtil.java b/src/main/java/org/apache/groovy/runtime/ObjectUtil.java
index f0f47c000c..661a3012e8 100644
--- a/src/main/java/org/apache/groovy/runtime/ObjectUtil.java
+++ b/src/main/java/org/apache/groovy/runtime/ObjectUtil.java
@@ -19,6 +19,7 @@
package org.apache.groovy.runtime;
import org.codehaus.groovy.GroovyBugError;
+import org.codehaus.groovy.runtime.ArrayUtil;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
@@ -41,10 +42,37 @@ public class ObjectUtil {
@SuppressWarnings("unchecked")
public static <T> T cloneObject(T object) throws Throwable {
if (null == object) return null;
- if (!(object instanceof Cloneable)) throw new CloneNotSupportedException(object.getClass().getName());
- final Method cloneMethod = object.getClass().getMethod("clone");
- final MethodHandle cloneMethodHandle = LOOKUP.in(object.getClass()).unreflect(cloneMethod);
+ final Class<?> clazz = object.getClass();
+ if (!(object instanceof Cloneable)) throw new CloneNotSupportedException(clazz.getName());
+
+ if (clazz.isArray()) {
+ if (clazz.getComponentType().isPrimitive()) {
+ if (byte[].class == clazz) {
+ return (T) ArrayUtil.cloneArray((byte[]) object);
+ } else if (short[].class == clazz) {
+ return (T) ArrayUtil.cloneArray((short[]) object);
+ } else if (int[].class == clazz) {
+ return (T) ArrayUtil.cloneArray((int[]) object);
+ } else if (char[].class == clazz) {
+ return (T) ArrayUtil.cloneArray((char[]) object);
+ } else if (long[].class == clazz) {
+ return (T) ArrayUtil.cloneArray((long[]) object);
+ } else if (float[].class == clazz) {
+ return (T) ArrayUtil.cloneArray((float[]) object);
+ } else if (double[].class == clazz) {
+ return (T) ArrayUtil.cloneArray((double[]) object);
+ } else if (boolean[].class == clazz) {
+ return (T) ArrayUtil.cloneArray((boolean[]) object);
+ }
+
+ throw new GroovyBugError(clazz.getName() + " is not an array of primitive type"); // should never happen
+ }
+ return (T) ArrayUtil.cloneArray((Object[]) object);
+ }
+
+ final Method cloneMethod = clazz.getMethod("clone");
+ final MethodHandle cloneMethodHandle = LOOKUP.in(clazz).unreflect(cloneMethod);
return (T) cloneMethodHandle.invokeWithArguments(object);
}
diff --git a/src/main/java/org/codehaus/groovy/runtime/ArrayUtil.java b/src/main/java/org/codehaus/groovy/runtime/ArrayUtil.java
index d35a4d80ea..1e80aa3b7d 100644
--- a/src/main/java/org/codehaus/groovy/runtime/ArrayUtil.java
+++ b/src/main/java/org/codehaus/groovy/runtime/ArrayUtil.java
@@ -18,12 +18,6 @@
*/
package org.codehaus.groovy.runtime;
-import org.codehaus.groovy.GroovyBugError;
-
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.reflect.Method;
-
/**
* This is a generated class used internally during the writing of bytecode within the CallSiteWriter logic.
* This is not a class exposed to users, as is the case with almost all classes in the org.codehaus.groovy packages.
@@ -61,31 +55,32 @@ import java.lang.reflect.Method;
public class ArrayUtil {
private static final Object[] EMPTY = new Object[0];
- public static MethodHandle getCloneArrayMethodHandle() {
- return MethodHandleHolder.CLONE_ARRAY_METHOD_HANDLE;
+ public static <T> T[] cloneArray(T[] array) {
+ return array.clone();
}
- private static class MethodHandleHolder {
- private static final MethodHandle CLONE_ARRAY_METHOD_HANDLE;
- static {
- final Class<ArrayUtil> arrayUtilClass = ArrayUtil.class;
- Method cloneArrayMethod;
- try {
- cloneArrayMethod = arrayUtilClass.getDeclaredMethod("cloneArray", Object[].class);
- } catch (NoSuchMethodException e) {
- throw new GroovyBugError("Failed to find `cloneArray` method in class `" + arrayUtilClass.getName() + "`", e);
- }
-
- try {
- CLONE_ARRAY_METHOD_HANDLE = MethodHandles.lookup().in(arrayUtilClass).unreflect(cloneArrayMethod);
- } catch (IllegalAccessException e) {
- throw new GroovyBugError("Failed to create method handle for " + cloneArrayMethod);
- }
- }
- private MethodHandleHolder() {}
+ public static byte[] cloneArray(byte[] array) {
+ return array.clone();
}
-
- public static <T> T[] cloneArray(T[] array) {
+ public static short[] cloneArray(short[] array) {
+ return array.clone();
+ }
+ public static int[] cloneArray(int[] array) {
+ return array.clone();
+ }
+ public static char[] cloneArray(char[] array) {
+ return array.clone();
+ }
+ public static long[] cloneArray(long[] array) {
+ return array.clone();
+ }
+ public static float[] cloneArray(float[] array) {
+ return array.clone();
+ }
+ public static double[] cloneArray(double[] array) {
+ return array.clone();
+ }
+ public static boolean[] cloneArray(boolean[] array) {
return array.clone();
}
diff --git a/src/main/java/org/codehaus/groovy/runtime/InvokerHelper.java b/src/main/java/org/codehaus/groovy/runtime/InvokerHelper.java
index 69d77eea97..d292a08329 100644
--- a/src/main/java/org/codehaus/groovy/runtime/InvokerHelper.java
+++ b/src/main/java/org/codehaus/groovy/runtime/InvokerHelper.java
@@ -597,7 +597,6 @@ public class InvokerHelper {
static Object invokePojoMethod(Object object, String methodName, Object arguments) {
if ("clone".equals(methodName) && (null == arguments || arguments.getClass().isArray() && 0 == ((Object[]) arguments).length)) {
- if (object.getClass().isArray()) return ArrayUtil.cloneArray((Object[]) object);
try {
return ObjectUtil.cloneObject(object);
} catch (Throwable t) {
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 ef34caf430..07f61adca7 100644
--- a/src/main/java/org/codehaus/groovy/vmplugin/v8/Selector.java
+++ b/src/main/java/org/codehaus/groovy/vmplugin/v8/Selector.java
@@ -39,7 +39,6 @@ import org.codehaus.groovy.reflection.CachedMethod;
import org.codehaus.groovy.reflection.ClassInfo;
import org.codehaus.groovy.reflection.GeneratedMetaMethod;
import org.codehaus.groovy.reflection.stdclasses.CachedSAMClass;
-import org.codehaus.groovy.runtime.ArrayUtil;
import org.codehaus.groovy.runtime.GeneratedClosure;
import org.codehaus.groovy.runtime.GroovyCategorySupport;
import org.codehaus.groovy.runtime.GroovyCategorySupport.CategoryMethod;
@@ -682,9 +681,6 @@ public abstract class Selector {
if (declaringClass == Class.class && parameterCount == 1 && methodName.equals("forName")) {
return MethodHandles.insertArguments(CLASS_FOR_NAME, 1, true, sender.getClassLoader());
} else if (declaringClass == Object.class && parameterCount == 0 && methodName.equals("clone") && null != args && 1 == args.length) {
- if (args[0].getClass().isArray()) {
- return ArrayUtil.getCloneArrayMethodHandle();
- }
return ObjectUtil.getCloneObjectMethodHandle();
}