This is an automated email from the ASF dual-hosted git repository. sunlan pushed a commit to branch GROOVY_4_0_X in repository https://gitbox.apache.org/repos/asf/groovy.git
commit aaa6bb076826b2ad6481317846458752ca4a0c35 Author: Daniel Sun <[email protected]> AuthorDate: Wed Apr 12 05:47:31 2023 +0800 Trivial refactoring: reuse `ArrayTypeUtils.dimension` --- .../groovy/transform/stc/StaticTypeCheckingSupport.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java index 0657c6854e..b0e040241e 100644 --- a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java +++ b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java @@ -47,6 +47,7 @@ import org.codehaus.groovy.ast.tools.WideningCategories; import org.codehaus.groovy.control.CompilationUnit; import org.codehaus.groovy.control.CompilerConfiguration; import org.codehaus.groovy.control.Phases; +import org.codehaus.groovy.runtime.ArrayTypeUtils; import org.codehaus.groovy.runtime.metaclass.MetaClassRegistryImpl; import org.codehaus.groovy.syntax.Types; import org.codehaus.groovy.tools.GroovyClass; @@ -1574,14 +1575,11 @@ public abstract class StaticTypeCheckingSupport { } private static int dimensions(ClassNode cn) { - int dims = 0; - while (cn.isArray()) { - cn = cn.getComponentType(); - dims += 1; + if (!cn.isArray()) { + return 0; } - return dims; + return ArrayTypeUtils.dimension(cn); } - private static boolean compatibleConnection(final GenericsType resolved, final GenericsType connection) { if (resolved.isPlaceholder() && resolved.getUpperBounds() != null
