Changeset 17802 in josm for trunk/src

Timestamp:

2021-04-19T21:45:14+02:00 (4 years ago)

Author:

simon04

Message:

see #20745 - Avoid heap allocations in MapCSS MatchingReferrerFinder due to Environment.withPrimitive

9.7% of MapCSSTagCheckerPerformanceTest#testCity amount to Environment.withPrimitive

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java

@@ -214 +214 @@
                 if (e.parent != null) return;
 
-                if (!left.matches(e.withPrimitive(parent)))
-                    return;
+                IPrimitive osm = e.osm;
+                try {
+                    e.osm = parent;
+                    if (!left.matches(e))
+                        return;
+                } catch (Exception exception) {
+                    e.osm = osm;
+                }
                 int count = parent instanceof IWay<?>
                         ? ((IWay<?>) parent).getNodesCount()