Trivial refactoring: avoid creating zero length array (cherry picked from commit 02dd6d6)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/e8f3a15f Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/e8f3a15f Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/e8f3a15f Branch: refs/heads/GROOVY_2_6_X Commit: e8f3a15fbe8efaf1b7ff729993446227b511ff8d Parents: aa53695 Author: sunlan <[email protected]> Authored: Mon Apr 2 11:41:42 2018 +0800 Committer: sunlan <[email protected]> Committed: Mon Apr 2 12:32:13 2018 +0800 ---------------------------------------------------------------------- .../asm/sc/StaticTypesBinaryExpressionMultiTypeDispatcher.java | 2 +- .../groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java | 2 +- .../groovy/transform/AutoImplementASTTransformation.java | 2 +- .../groovy/transform/MapConstructorASTTransformation.java | 2 +- .../groovy/transform/TupleConstructorASTTransformation.java | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/e8f3a15f/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesBinaryExpressionMultiTypeDispatcher.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesBinaryExpressionMultiTypeDispatcher.java b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesBinaryExpressionMultiTypeDispatcher.java index c327ba1..88ef284 100644 --- a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesBinaryExpressionMultiTypeDispatcher.java +++ b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesBinaryExpressionMultiTypeDispatcher.java @@ -85,7 +85,7 @@ import static org.codehaus.groovy.transform.stc.StaticTypesMarker.INFERRED_TYPE; public class StaticTypesBinaryExpressionMultiTypeDispatcher extends BinaryExpressionMultiTypeDispatcher implements Opcodes { private final AtomicInteger labelCounter = new AtomicInteger(); - private static final MethodNode CLOSURE_GETTHISOBJECT_METHOD = CLOSURE_TYPE.getMethod("getThisObject", new Parameter[0]); + private static final MethodNode CLOSURE_GETTHISOBJECT_METHOD = CLOSURE_TYPE.getMethod("getThisObject", Parameter.EMPTY_ARRAY); public StaticTypesBinaryExpressionMultiTypeDispatcher(WriterController wc) { http://git-wip-us.apache.org/repos/asf/groovy/blob/e8f3a15f/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java index f1ff7dd..f89a675 100644 --- a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java +++ b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java @@ -100,7 +100,7 @@ public class StaticTypesCallSiteWriter extends CallSiteWriter implements Opcodes private static final MethodNode GROOVYOBJECT_GETPROPERTY_METHOD = GROOVY_OBJECT_TYPE.getMethod("getProperty", new Parameter[]{new Parameter(STRING_TYPE, "propertyName")}); private static final MethodNode INVOKERHELPER_GETPROPERTY_METHOD = INVOKERHELPER_TYPE.getMethod("getProperty", new Parameter[]{new Parameter(OBJECT_TYPE, "object"), new Parameter(STRING_TYPE, "propertyName")}); private static final MethodNode INVOKERHELPER_GETPROPERTYSAFE_METHOD = INVOKERHELPER_TYPE.getMethod("getPropertySafe", new Parameter[]{new Parameter(OBJECT_TYPE, "object"), new Parameter(STRING_TYPE, "propertyName")}); - private static final MethodNode CLOSURE_GETTHISOBJECT_METHOD = CLOSURE_TYPE.getMethod("getThisObject", new Parameter[0]); + private static final MethodNode CLOSURE_GETTHISOBJECT_METHOD = CLOSURE_TYPE.getMethod("getThisObject", Parameter.EMPTY_ARRAY); private static final ClassNode COLLECTION_TYPE = make(Collection.class); private static final MethodNode COLLECTION_SIZE_METHOD = COLLECTION_TYPE.getMethod("size", Parameter.EMPTY_ARRAY); private static final MethodNode MAP_GET_METHOD = MAP_TYPE.getMethod("get", new Parameter[] { new Parameter(OBJECT_TYPE, "key")}); http://git-wip-us.apache.org/repos/asf/groovy/blob/e8f3a15f/src/main/java/org/codehaus/groovy/transform/AutoImplementASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/transform/AutoImplementASTTransformation.java b/src/main/java/org/codehaus/groovy/transform/AutoImplementASTTransformation.java index ed09711..0507116 100644 --- a/src/main/java/org/codehaus/groovy/transform/AutoImplementASTTransformation.java +++ b/src/main/java/org/codehaus/groovy/transform/AutoImplementASTTransformation.java @@ -85,7 +85,7 @@ public class AutoImplementASTTransformation extends AbstractASTTransformation { } createMethods(cNode, exception, message, (ClosureExpression) code); if (code != null) { - anno.setMember("code", new ClosureExpression(new Parameter[0], EmptyStatement.INSTANCE)); + anno.setMember("code", new ClosureExpression(Parameter.EMPTY_ARRAY, EmptyStatement.INSTANCE)); } } } http://git-wip-us.apache.org/repos/asf/groovy/blob/e8f3a15f/src/main/java/org/codehaus/groovy/transform/MapConstructorASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/transform/MapConstructorASTTransformation.java b/src/main/java/org/codehaus/groovy/transform/MapConstructorASTTransformation.java index a1aa094..9016c16 100644 --- a/src/main/java/org/codehaus/groovy/transform/MapConstructorASTTransformation.java +++ b/src/main/java/org/codehaus/groovy/transform/MapConstructorASTTransformation.java @@ -128,7 +128,7 @@ public class MapConstructorASTTransformation extends AbstractASTTransformation i createConstructors(this, anno, handler, cNode, includeFields, includeProperties, includeSuperProperties, includeSuperFields, noArg, allNames, allProperties, specialNamedArgHandling, includeStatic, excludes, includes, (ClosureExpression) pre, (ClosureExpression) post, source); if (pre != null) { - anno.setMember("pre", new ClosureExpression(new Parameter[0], EmptyStatement.INSTANCE)); + anno.setMember("pre", new ClosureExpression(Parameter.EMPTY_ARRAY, EmptyStatement.INSTANCE)); } if (post != null) { anno.setMember("post", new ClosureExpression(new Parameter[0], EmptyStatement.INSTANCE)); http://git-wip-us.apache.org/repos/asf/groovy/blob/e8f3a15f/src/main/java/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java b/src/main/java/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java index 33b1729..94e31f9 100644 --- a/src/main/java/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java +++ b/src/main/java/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java @@ -156,10 +156,10 @@ public class TupleConstructorASTTransformation extends AbstractASTTransformation sourceUnit, handler, (ClosureExpression) pre, (ClosureExpression) post); if (pre != null) { - anno.setMember("pre", new ClosureExpression(new Parameter[0], EmptyStatement.INSTANCE)); + anno.setMember("pre", new ClosureExpression(Parameter.EMPTY_ARRAY, EmptyStatement.INSTANCE)); } if (post != null) { - anno.setMember("post", new ClosureExpression(new Parameter[0], EmptyStatement.INSTANCE)); + anno.setMember("post", new ClosureExpression(Parameter.EMPTY_ARRAY, EmptyStatement.INSTANCE)); } } }
