[GR-73037] Simplify attribute access related nodes.

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextStructSeqBuiltins.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 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
@@ -139,7 +139,6 @@ abstract static class GraalPyPrivate_StructSequence_NewType extends CApiQuaterna
         Object doGeneric(TruffleString typeName, TruffleString typeDoc, Object fields, int nInSequence,
                         @Cached GraalPyPrivate_StructSequence_InitType2 initNode,
                         @Cached ReadAttributeFromModuleNode readTypeBuiltinNode,
-                        @Cached DynamicObject.GetShapeFlagsNode getShapeFlagsNode,
                         @Cached DynamicObject.SetShapeFlagsNode setShapeFlagsNode,
                         @Cached CallNode callTypeNewNode,
                         @Bind PythonLanguage language) {
@@ -149,7 +148,7 @@ Object doGeneric(TruffleString typeName, TruffleString typeDoc, Object fields, i
             Object cls = callTypeNewNode.executeWithoutFrame(typeBuiltin, typeName, bases, namespace);
             initNode.execute(cls, fields, nInSequence);
             if (cls instanceof PythonClass pythonClass) {
-                pythonClass.makeStaticBase(getShapeFlagsNode, setShapeFlagsNode);
+                pythonClass.makeStaticBase(setShapeFlagsNode);
             }
             return cls;
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/PythonObject.java

@@ -144,12 +144,4 @@ public String toString() {
     public static int getCallSiteInlineCacheMaxDepth() {
         return PythonOptions.getCallSiteInlineCacheMaxDepth();
     }
-
-    public final void addShapeFlag(int flag, DynamicObject.GetShapeFlagsNode getShapeFlagsNode, DynamicObject.SetShapeFlagsNode setShapeFlagsNode) {
-        int oldFlags = getShapeFlagsNode.execute(this);
-        int newFlags = oldFlags | flag;
-        if (newFlags != oldFlags) {
-            setShapeFlagsNode.execute(this, newFlags);
-        }
-    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/PythonClass.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -217,8 +217,8 @@ public void setDictHiddenProp(Node inliningTarget, HiddenAttr.WriteNode writeNod
         }
     }
 
-    public void makeStaticBase(DynamicObject.GetShapeFlagsNode getShapeFlagsNode, DynamicObject.SetShapeFlagsNode setShapeFlagsNode) {
-        addShapeFlag(IS_STATIC_BASE, getShapeFlagsNode, setShapeFlagsNode);
+    public void makeStaticBase(DynamicObject.SetShapeFlagsNode setShapeFlagsNode) {
+        setShapeFlagsNode.executeAdd(this, IS_STATIC_BASE);
     }
 
     public boolean isStaticBase() {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TpSlots.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 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
@@ -233,7 +233,9 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
+import com.oracle.truffle.api.nodes.DenyReplace;
 import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.nodes.UnadoptableNode;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.profiles.InlinedBranchProfile;
 import com.oracle.truffle.api.strings.TruffleString;
@@ -2024,8 +2026,9 @@ static TpSlots doOtherCached(Node inliningTarget, Object klass,
             return weakValueProfile.execute(inliningTarget, getSlots.execute(inliningTarget, klass));
         }
 
+        @DenyReplace
         @GenerateCached(false)
-        private static final class Uncached extends GetCachedTpSlotsNode {
+        private static final class Uncached extends GetCachedTpSlotsNode implements UnadoptableNode {
             private static final Uncached INSTANCE = new Uncached();
 
             @Override

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeNodes.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -205,6 +205,7 @@
 import com.oracle.graal.python.nodes.object.GetOrCreateDictNode;
 import com.oracle.graal.python.nodes.util.CannotCastException;
 import com.oracle.graal.python.nodes.util.CastToTruffleStringNode;
+import com.oracle.graal.python.nodes.util.LazyInteropLibrary;
 import com.oracle.graal.python.runtime.ExecutionContext.BoundaryCallContext;
 import com.oracle.graal.python.runtime.IndirectCallData.BoundaryCallData;
 import com.oracle.graal.python.runtime.PythonContext;
@@ -1510,10 +1511,15 @@ static boolean doNative(PythonAbstractNativeObject left, PythonAbstractNativeObj
             return lib.isIdentical(left.getPtr(), right.getPtr(), lib);
         }
 
-        @Specialization(guards = {"isForeignObject(left)", "isForeignObject(right)"})
+        @Fallback
         @InliningCutoff
-        static boolean doOther(Object left, Object right,
-                        @CachedLibrary(limit = "2") InteropLibrary lib) {
+        static boolean doOther(Node inliningTarget, Object left, Object right,
+                        @Cached LazyInteropLibrary lazyInterop) {
+            if (!(PGuards.isForeignObject(left) && PGuards.isForeignObject(right))) {
+                return false;
+            }
+
+            InteropLibrary lib = lazyInterop.get(inliningTarget);
             if (lib.isMetaObject(left) && lib.isMetaObject(right)) {
                 if (left == right) {
                     return true;
@@ -1540,11 +1546,6 @@ static boolean doOther(Object left, Object right,
             }
             return false;
         }
-
-        @Fallback
-        static boolean doOther(@SuppressWarnings("unused") Object left, @SuppressWarnings("unused") Object right) {
-            return false;
-        }
     }
 
     @GenerateUncached