[GR-29753] Fix contract violations triggered in test_interop

Author: timfel

graalpython/com.oracle.graal.python.test/src/tests/test_interop.py

@@ -160,9 +160,6 @@ def test_remove():
         polyglot.__remove__(o, "@direct_field")
         assert not hasattr(o, "direct_field")
 
-        o["grrrr"] = 12
-        polyglot.__remove__(o, "grrrr")
-        assert "grrrr" not in list(o.keys())
 
     def test_execute():
         assert polyglot.__execute__(abs, -10) == 10
@@ -251,7 +248,6 @@ def test_key_info():
 
         assert polyglot.__key_info__(o, "__getattribute__", "readable")
         assert polyglot.__key_info__(o, "__getattribute__", "invokable")
-        assert not polyglot.__key_info__(o, "__getattribute__", "modifiable")
         assert not polyglot.__key_info__(o, "__getattribute__", "removable")
         assert not polyglot.__key_info__(o, "__getattribute__", "insertable")
 
@@ -268,12 +264,12 @@ def test_java_classpath():
             java.add_to_classpath(1)
         except TypeError as e:
             assert "classpath argument 1 must be string, not int" in str(e)
-            
+
         try:
             java.add_to_classpath('a', 1)
         except TypeError as e:
             assert "classpath argument 2 must be string, not int" in str(e)
-        
+
     def test_host_lookup():
         import java
         try:

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PythonAbstractObject.java

@@ -1496,6 +1496,14 @@ static int access(Object object, String fieldName,
                 if (!isImmutable.execute(owner)) {
                     info |= REMOVABLE;
                     info |= MODIFIABLE;
+                } else if (owner != object && (info & WRITE_SIDE_EFFECTS) == 0) {
+                    // we already checked the owner to be immutable at this point, so we definitely
+                    // cannot remove it (lookup will always lead to that not mutable owner). But if
+                    // it's not a setter, we may still be able to write that attribute directly on
+                    // the object
+                    if (!isImmutable.execute(object)) {
+                        info |= MODIFIABLE;
+                    }
                 }
             } else {
                 if (dataModelLibrary.isSequence(object) && isItemReadable(object, fieldName, getItemNode)) {