Remove StringUtils.EqualNode.

Author: woess

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -55,10 +55,8 @@
 
 import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.HostCompilerDirectives.InliningCutoff;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Shared;
-import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateCached;
 import com.oracle.truffle.api.dsl.GenerateInline;
 import com.oracle.truffle.api.dsl.GenerateUncached;
@@ -586,30 +584,6 @@ public static int getCodePoint(String characterName) {
         }
     }
 
-    /**
-     * Like {@link com.oracle.truffle.api.strings.TruffleString.EqualNode} but with the proper
-     * {@link InliningCutoff} since {@link com.oracle.truffle.api.strings.TruffleString.EqualNode}
-     * is too big for host inlining, at least when used in node guards.
-     */
-    @GenerateInline
-    @GenerateCached(false)
-    @GenerateUncached
-    public abstract static class EqualNode extends Node {
-        public abstract boolean execute(Node inliningTarget, TruffleString left, TruffleString right);
-
-        @Specialization(guards = "left == right")
-        static boolean doIdentity(TruffleString left, TruffleString right) {
-            return true;
-        }
-
-        @InliningCutoff
-        @Fallback
-        static boolean doEquality(TruffleString left, TruffleString right,
-                        @Cached TruffleString.EqualNode equalNode) {
-            return equalNode.execute(left, right, TS_ENCODING);
-        }
-    }
-
     public static int codepointIndexToByteIndex(int codepointIndex) {
         assert TS_ENCODING == TruffleString.Encoding.UTF_32 : "must be adapted when switching to a different encoding";
         return codepointIndex << 2;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/LookupAttributeInMRONode.java

@@ -44,7 +44,6 @@
 import com.oracle.graal.python.builtins.Python3Core;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.objects.PNone;
-import com.oracle.graal.python.builtins.objects.str.StringUtils;
 import com.oracle.graal.python.builtins.objects.type.MroShape;
 import com.oracle.graal.python.builtins.objects.type.MroShape.MroShapeLookupResult;
 import com.oracle.graal.python.builtins.objects.type.PythonAbstractClass;
@@ -56,6 +55,7 @@
 import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.exception.StacktracelessCheckedException;
 import com.oracle.graal.python.runtime.sequence.storage.MroSequenceStorage;
+import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -93,16 +93,17 @@ public final Object execute(Object klass) {
 
     protected abstract Object executeInternal(Object klass) throws MROChangedException;
 
+    @ImportStatic(PythonUtils.class)
     @GenerateUncached
-    @GenerateInline(false) // footprint reduction 36 -> 17
+    @GenerateInline(false)
     public abstract static class Dynamic extends PNodeWithContext {
         public abstract Object execute(Object klass, TruffleString key);
 
-        @Specialization(guards = "equalNode.execute(inliningTarget, key, cachedKey)", limit = "2")
+        @Specialization(guards = "equalNode.execute(key, cachedKey, TS_ENCODING)", limit = "2")
         static Object lookupConstantMROEquals(Object klass, TruffleString key,
                         @Bind Node inliningTarget,
                         @Cached("key") TruffleString cachedKey,
-                        @Cached @Shared StringUtils.EqualNode equalNode,
+                        @Cached @Shared TruffleString.EqualNode equalNode,
                         @Cached("create(cachedKey)") LookupAttributeInMRONode lookup) {
             return lookup.execute(klass);
         }