PythonObject#get/setAttribute() accepts TruffleString only

Author: otethal

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/PythonBuiltins.java

@@ -297,7 +297,7 @@ void addConstantsToModuleObject(PythonObject obj) {
                 HiddenAttr.WriteNode.executeUncached(obj, attr, value);
             } else {
                 assert constant instanceof TruffleString;
-                obj.setAttribute(constant, value);
+                obj.setAttribute((TruffleString) constant, value);
             }
         }
     }

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

@@ -105,22 +105,17 @@ public Object getInitialPythonClass() {
         return initialPythonClass;
     }
 
-    @SuppressWarnings("deprecation")
     @TruffleBoundary
-    public final Object getAttribute(Object key) {
-        return DynamicObjectLibrary.getUncached().getOrDefault(this, assertNoJavaString(key), PNone.NO_VALUE);
+    public final Object getAttribute(TruffleString key) {
+        return DynamicObjectLibrary.getUncached().getOrDefault(this, key, PNone.NO_VALUE);
     }
 
-    @SuppressWarnings("deprecation")
     @TruffleBoundary
-    public void setAttribute(Object nameObj, Object value) {
-        Object name = assertNoJavaString(nameObj);
-        assert name instanceof TruffleString : name.getClass().getSimpleName();
+    public void setAttribute(TruffleString name, Object value) {
         CompilerAsserts.neverPartOfCompilation();
         DynamicObjectLibrary.getUncached().put(this, name, assertNoJavaString(value));
     }
 
-    @SuppressWarnings("deprecation")
     @TruffleBoundary
     public List<TruffleString> getAttributeNames() {
         ArrayList<TruffleString> keyList = new ArrayList<>();

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

@@ -71,7 +71,7 @@ public PythonBuiltinClass(PythonLanguage lang, PythonBuiltinClassType builtinCla
     }
 
     @Override
-    public void setAttribute(Object name, Object value) {
+    public void setAttribute(TruffleString name, Object value) {
         CompilerAsserts.neverPartOfCompilation();
         if (!PythonContext.get(null).isCoreInitialized()) {
             setAttributeUnsafe(name, value);
@@ -83,7 +83,7 @@ public void setAttribute(Object name, Object value) {
     /**
      * Modify attributes in an unsafe way, should only use when initializing.
      */
-    public void setAttributeUnsafe(Object name, Object value) {
+    public void setAttributeUnsafe(TruffleString name, Object value) {
         super.setAttribute(name, value);
     }
 

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

@@ -113,7 +113,7 @@ public void invalidateSlotsFinalAssumption() {
     @Override
     @TruffleBoundary
     @SuppressFBWarnings(value = "UR_UNINIT_READ_CALLED_FROM_SUPER_CONSTRUCTOR")
-    public void setAttribute(Object key, Object value) {
+    public void setAttribute(TruffleString key, Object value) {
         if (slotsFinalAssumption != null) {
             // It is OK when slotsFinalAssumption is null during the super ctor call
             invalidateSlotsFinalAssumption();

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

@@ -27,7 +27,6 @@
 
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.TypeError;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.T___DOC__;
-import static com.oracle.graal.python.nodes.truffle.TruffleStringMigrationHelpers.assertNoJavaString;
 
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.PNone;
@@ -213,8 +212,7 @@ private boolean computeNeedsNativeAllocation() {
 
     @Override
     @TruffleBoundary
-    public void setAttribute(Object keyObj, Object value) {
-        Object key = assertNoJavaString(keyObj);
+    public void setAttribute(TruffleString key, Object value) {
         super.setAttribute(key, value);
         onAttributeUpdate(key, value);
     }