GROOVY-11841: reduce nesting and mutation

Author: eric-milles

src/main/java/groovy/lang/MetaClassImpl.java

@@ -288,25 +288,35 @@ public MetaProperty hasProperty(final Object obj, final String name) {
      */
     @Override
     public MetaProperty getMetaProperty(final String name) {
-        MetaProperty metaProperty = null;
-
-        Map<String, MetaProperty> propertyMap = subMap(classPropertyIndex, theCachedClass);
-        metaProperty = propertyMap.get(name);
-        if (metaProperty == null) {
-            metaProperty = staticPropertyIndex.get(name);
-            if (metaProperty == null) {
-                propertyMap = subMap(classPropertyIndexForSuper, theCachedClass);
-                metaProperty = propertyMap.get(name);
-                if (metaProperty == null) {
-                    MetaBeanProperty property = findPropertyInClassHierarchy(name, theCachedClass);
-                    if (property != null) {
-                        onSuperPropertyFoundInHierarchy(property);
-                        metaProperty = property;
-                    }
-                }
+        MetaProperty metaProperty;
+
+        var propertyMap = classPropertyIndex.get(theCachedClass);
+        if (propertyMap != null) {
+            metaProperty = propertyMap.get(name);
+            if (metaProperty != null) {
+                return metaProperty;
+            }
+        }
+
+        metaProperty = staticPropertyIndex.get(name);
+        if (metaProperty != null) {
+            return metaProperty;
+        }
+
+        propertyMap = classPropertyIndexForSuper.get(theCachedClass);
+        if (propertyMap != null) {
+            metaProperty = propertyMap.get(name);
+            if (metaProperty != null) {
+                return metaProperty;
             }
         }
 
+        var metaBeanProperty = findPropertyInClassHierarchy(name, theCachedClass);
+        if (metaBeanProperty != null) {
+            metaProperty = metaBeanProperty;
+            onSuperPropertyFoundInHierarchy(metaBeanProperty);
+        }
+
         return metaProperty;
     }