Remove PythonObject#getStorage()

Author: otethal

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

@@ -235,7 +235,7 @@ static Object moduleFunction(Object methodDefPtr, PythonModule mod, TruffleStrin
                         @Cached ObjectBuiltins.SetattrNode setattrNode,
                         @Cached ReadAttributeFromDynamicObjectNode readAttrNode,
                         @Cached CFunctionNewExMethodNode cFunctionNewExMethodNode) {
-            Object modName = readAttrNode.execute(mod.getStorage(), T___NAME__, null);
+            Object modName = readAttrNode.execute(mod, T___NAME__, null);
             assert modName != null : "module name is missing!";
             Object func = cFunctionNewExMethodNode.execute(inliningTarget, methodDefPtr, name, cfunc, flags, wrapper, mod, modName, doc);
             setattrNode.execute(null, mod, name, func);

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

@@ -853,7 +853,7 @@ static Object doTpDict(PythonManagedClass object, Object value,
                 if (existing != null) {
                     dict.setDictStorage(existing.getDictStorage());
                 } else {
-                    dict.setDictStorage(new DynamicObjectStorage(object.getStorage()));
+                    dict.setDictStorage(new DynamicObjectStorage(object));
                 }
                 setDict.execute(inliningTarget, object, dict);
             } else {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/CDataBuiltins.java

@@ -175,7 +175,7 @@ static Object reduce(VirtualFrame frame, CDataObject self,
             Object clazz = getClassNode.execute(inliningTarget, self);
             Object[] t2 = new Object[]{clazz, factory.createTuple(t1)};
             PythonModule ctypes = PythonContext.get(inliningTarget).lookupBuiltinModule(T__CTYPES);
-            Object unpickle = readAttrNode.execute(ctypes.getStorage(), T_UNPICKLE, null);
+            Object unpickle = readAttrNode.execute(ctypes, T_UNPICKLE, null);
             if (unpickle == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 throw PRaiseNode.raiseUncached(inliningTarget, NotImplementedError, toTruffleStringUncached("unpickle isn't supported yet."));

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/ToNativeTypeNode.java

@@ -321,7 +321,7 @@ static void initializeType(PythonClassNativeWrapper obj, Object mem, boolean hea
         if (!(dict instanceof StgDictObject)) {
             HashingStorage dictStorage = dict.getDictStorage();
             if (!(dictStorage instanceof DynamicObjectStorage)) {
-                HashingStorage storage = new DynamicObjectStorage(clazz.getStorage());
+                HashingStorage storage = new DynamicObjectStorage(clazz);
                 dict.setDictStorage(storage);
                 if (dictStorage != null) {
                     // copy all mappings to the new storage

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

@@ -44,7 +44,6 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.NeverDefault;
 import com.oracle.truffle.api.nodes.Node;
-import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectLibrary;
 import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.api.strings.TruffleString;
@@ -106,14 +105,10 @@ public Object getInitialPythonClass() {
         return initialPythonClass;
     }
 
-    public final DynamicObject getStorage() {
-        return this;
-    }
-
     @SuppressWarnings("deprecation")
     @TruffleBoundary
     public final Object getAttribute(Object key) {
-        return DynamicObjectLibrary.getUncached().getOrDefault(getStorage(), assertNoJavaString(key), PNone.NO_VALUE);
+        return DynamicObjectLibrary.getUncached().getOrDefault(this, assertNoJavaString(key), PNone.NO_VALUE);
     }
 
     @SuppressWarnings("deprecation")
@@ -122,15 +117,15 @@ public void setAttribute(Object nameObj, Object value) {
         Object name = assertNoJavaString(nameObj);
         assert name instanceof TruffleString : name.getClass().getSimpleName();
         CompilerAsserts.neverPartOfCompilation();
-        DynamicObjectLibrary.getUncached().put(getStorage(), name, assertNoJavaString(value));
+        DynamicObjectLibrary.getUncached().put(this, name, assertNoJavaString(value));
     }
 
     @SuppressWarnings("deprecation")
     @TruffleBoundary
     public List<TruffleString> getAttributeNames() {
         ArrayList<TruffleString> keyList = new ArrayList<>();
-        for (Object o : getStorage().getShape().getKeyList()) {
-            if (o instanceof TruffleString && DynamicObjectLibrary.getUncached().getOrDefault(getStorage(), o, PNone.NO_VALUE) != PNone.NO_VALUE) {
+        for (Object o : getShape().getKeyList()) {
+            if (o instanceof TruffleString && DynamicObjectLibrary.getUncached().getOrDefault(this, o, PNone.NO_VALUE) != PNone.NO_VALUE) {
                 keyList.add((TruffleString) o);
             }
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java

@@ -853,11 +853,11 @@ public final PDict createDictFromMapGeneric(LinkedHashMap<Object, Object> map) {
     }
 
     public final PDict createDictFixedStorage(PythonObject pythonObject, MroSequenceStorage mroSequenceStorage) {
-        return createDict(new DynamicObjectStorage(pythonObject.getStorage(), mroSequenceStorage));
+        return createDict(new DynamicObjectStorage(pythonObject, mroSequenceStorage));
     }
 
     public final PDict createDictFixedStorage(PythonObject pythonObject) {
-        return createDict(new DynamicObjectStorage(pythonObject.getStorage()));
+        return createDict(new DynamicObjectStorage(pythonObject));
     }
 
     public final PDict createDict(Object cls, HashingStorage storage) {