Fix: did not use parent's delegate field everywhere.

fangerer · fangerer · commit 889414e9e9c0 · 2018-10-22T09:50:18.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TruffleCextBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TruffleCextBuiltins.java
@@ -1175,7 +1175,7 @@ public static GetByteArrayNode create() {
 
         @Specialization
         byte[] doCArrayWrapper(CByteArrayWrapper o, @SuppressWarnings("unused") long size) {
-            return o.getDelegate();
+            return o.getByteArray();
         }
 
         @Specialization
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/CArrayWrapperMR.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/CArrayWrapperMR.java
@@ -66,7 +66,7 @@ public class CArrayWrapperMR {
     @Resolve(message = "READ")
     abstract static class ReadNode extends Node {
         public char access(CStringWrapper object, int idx) {
-            String s = object.getDelegate();
+            String s = object.getString();
             if (idx >= 0 && idx < s.length()) {
                 return s.charAt(idx);
             } else if (idx == s.length()) {
@@ -86,7 +86,7 @@ public char access(CStringWrapper object, long idx) {
         }
 
         public byte access(CByteArrayWrapper object, int idx) {
-            byte[] arr = object.getDelegate();
+            byte[] arr = object.getByteArray();
             if (idx >= 0 && idx < arr.length) {
                 return arr[idx];
             } else if (idx == arr.length) {
@@ -127,7 +127,7 @@ abstract static class GetTypeIDNode extends CExtBaseNode {
 
         @Specialization
         Object doTuple(CStringWrapper object) {
-            return callGetByteArrayTypeID(object.getDelegate().length());
+            return callGetByteArrayTypeID(object.getString().length());
         }
 
         private Object callGetByteArrayTypeID(long len) {
@@ -149,11 +149,11 @@ boolean access(@SuppressWarnings("unused") CArrayWrapper obj) {
     @Resolve(message = "GET_SIZE")
     abstract static class GetSizeNode extends Node {
         long access(CStringWrapper obj) {
-            return obj.getDelegate().length();
+            return obj.getString().length();
         }
 
         int access(CByteArrayWrapper obj) {
-            return obj.getDelegate().length;
+            return obj.getByteArray().length;
         }
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/CArrayWrappers.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/CArrayWrappers.java
@@ -53,6 +53,10 @@ public abstract class CArrayWrappers {
 
     public abstract static class CArrayWrapper extends PythonNativeWrapper {
 
+        public CArrayWrapper(Object delegate) {
+            super(delegate);
+        }
+
         static boolean isInstance(TruffleObject o) {
             return o instanceof CArrayWrapper;
         }
@@ -71,15 +75,12 @@ public ForeignAccess getForeignAccess() {
      */
     public static class CStringWrapper extends CArrayWrapper {
 
-        private final String delegate;
-
         public CStringWrapper(String delegate) {
-            this.delegate = delegate;
+            super(delegate);
         }
 
-        @Override
-        public String getDelegate() {
-            return delegate;
+        public String getString() {
+            return (String) getDelegate();
         }
 
     }
@@ -90,15 +91,12 @@ public String getDelegate() {
      */
     public static class CByteArrayWrapper extends CArrayWrapper {
 
-        private final byte[] delegate;
-
         public CByteArrayWrapper(byte[] delegate) {
-            this.delegate = delegate;
+            super(delegate);
         }
 
-        @Override
-        public byte[] getDelegate() {
-            return delegate;
+        public byte[] getByteArray() {
+            return (byte[]) getDelegate();
         }
 
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/ManagedMethodWrappers.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/ManagedMethodWrappers.java
@@ -50,15 +50,9 @@
 public abstract class ManagedMethodWrappers {
 
     public abstract static class MethodWrapper extends PythonNativeWrapper {
-        private final Object method;
 
         public MethodWrapper(Object method) {
-            this.method = method;
-        }
-
-        @Override
-        public Object getDelegate() {
-            return method;
+            super(method);
         }
 
         static boolean isInstance(TruffleObject o) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/NativeWrappers.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/NativeWrappers.java
@@ -67,7 +67,7 @@ public PythonNativeWrapper(Object delegate) {
             this.delegate = delegate;
         }
 
-        public Object getDelegate() {
+        public final Object getDelegate() {
             return delegate;
         }
 
@@ -417,9 +417,8 @@ public PyUnicodeWrapper(PString delegate) {
             super(delegate);
         }
 
-        @Override
-        public PString getDelegate() {
-            return (PString) super.getDelegate();
+        public PString getPString() {
+            return (PString) getDelegate();
         }
 
         @Override
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PyBufferProcsWrapper.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PyBufferProcsWrapper.java
@@ -47,15 +47,8 @@
 
 public class PyBufferProcsWrapper extends PythonNativeWrapper {
 
-    private final PythonClass delegate;
-
     public PyBufferProcsWrapper(PythonClass delegate) {
-        this.delegate = delegate;
-    }
-
-    @Override
-    public PythonClass getDelegate() {
-        return delegate;
+        super(delegate);
     }
 
     static boolean isInstance(TruffleObject o) {
@@ -66,4 +59,8 @@ static boolean isInstance(TruffleObject o) {
     public ForeignAccess getForeignAccess() {
         return PyBufferProcsWrapperMRForeign.ACCESS;
     }
+
+    public PythonClass getPythonClass() {
+        return (PythonClass) getDelegate();
+    }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PyBufferProcsWrapperMR.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PyBufferProcsWrapperMR.java
@@ -58,7 +58,7 @@ abstract static class ReadNode extends Node {
 
         public Object access(PyBufferProcsWrapper object, String key) {
             // translate key to attribute name
-            PythonClassNativeWrapper nativeWrapper = object.getDelegate().getNativeWrapper();
+            PythonClassNativeWrapper nativeWrapper = object.getPythonClass().getNativeWrapper();
             // TODO handle case if nativeWrapper does not exist yet
             Object result;
             switch (key) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PyNumberMethodsWrapper.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PyNumberMethodsWrapper.java
@@ -50,15 +50,8 @@
  */
 public class PyNumberMethodsWrapper extends PythonNativeWrapper {
 
-    private final PythonClass delegate;
-
     public PyNumberMethodsWrapper(PythonClass delegate) {
-        this.delegate = delegate;
-    }
-
-    @Override
-    public PythonClass getDelegate() {
-        return delegate;
+        super(delegate);
     }
 
     static boolean isInstance(TruffleObject o) {
@@ -69,4 +62,8 @@ static boolean isInstance(TruffleObject o) {
     public ForeignAccess getForeignAccess() {
         return PyNumberMethodsWrapperMRForeign.ACCESS;
     }
+
+    public PythonClass getPythonClass() {
+        return (PythonClass) getDelegate();
+    }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PyNumberMethodsWrapperMR.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PyNumberMethodsWrapperMR.java
@@ -78,7 +78,7 @@ abstract static class ReadNode extends Node {
 
         public Object access(PyNumberMethodsWrapper object, String key) {
             // translate key to attribute name
-            PythonClass delegate = object.getDelegate();
+            PythonClass delegate = object.getPythonClass();
             return getToSulongNode().execute(readMethodNode.execute(delegate, key));
         }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PyProcsWrapper.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PyProcsWrapper.java
@@ -46,15 +46,8 @@
 
 public abstract class PyProcsWrapper extends PythonNativeWrapper {
 
-    private final Object delegate;
-
     public PyProcsWrapper(Object delegate) {
-        this.delegate = delegate;
-    }
-
-    @Override
-    public Object getDelegate() {
-        return delegate;
+        super(delegate);
     }
 
     static boolean isInstance(TruffleObject o) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PySequenceMethodsWrapper.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PySequenceMethodsWrapper.java
@@ -50,15 +50,8 @@
  */
 public class PySequenceMethodsWrapper extends PythonNativeWrapper {
 
-    private final PythonClass delegate;
-
     public PySequenceMethodsWrapper(PythonClass delegate) {
-        this.delegate = delegate;
-    }
-
-    @Override
-    public PythonClass getDelegate() {
-        return delegate;
+        super(delegate);
     }
 
     static boolean isInstance(TruffleObject o) {
@@ -69,4 +62,8 @@ static boolean isInstance(TruffleObject o) {
     public ForeignAccess getForeignAccess() {
         return PySequenceMethodsWrapperMRForeign.ACCESS;
     }
+
+    public PythonClass getPythonClass() {
+        return (PythonClass) getDelegate();
+    }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PySequenceMethodsWrapperMR.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PySequenceMethodsWrapperMR.java
@@ -60,7 +60,7 @@ abstract static class ReadNode extends Node {
         @Child private ToSulongNode toSulongNode;
 
         public Object access(PySequenceMethodsWrapper object, String key) {
-            PythonClass delegate = object.getDelegate();
+            PythonClass delegate = object.getPythonClass();
             Object result;
             switch (key) {
                 case NativeMemberNames.SQ_REPEAT:
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PyUnicodeWrapperMR.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PyUnicodeWrapperMR.java
@@ -81,7 +81,7 @@ public Object access(PyUnicodeData object, String key) {
                 case NativeMemberNames.UNICODE_DATA_UCS2:
                 case NativeMemberNames.UNICODE_DATA_UCS4:
                     elementSize = (int) getSizeofWcharNode().execute();
-                    PString s = object.getDelegate();
+                    PString s = object.getPString();
                     return new PySequenceArrayWrapper(getAsWideCharNode().execute(s, elementSize, s.len()), elementSize);
             }
             throw UnknownIdentifierException.raise(key);
@@ -90,7 +90,7 @@ public Object access(PyUnicodeData object, String key) {
         public Object access(PyUnicodeState object, String key) {
             // padding(24), ready(1), ascii(1), compact(1), kind(3), interned(2)
             int value = 0b000000000000000000000000_1_0_0_000_00;
-            if (onlyAscii(object.getDelegate().getValue())) {
+            if (onlyAscii(object.getPString().getValue())) {
                 value |= 0b1_0_000_00;
             }
             value |= ((int) getSizeofWcharNode().execute() << 2) & 0b11100;

Original file line number	Diff line number	Diff line change
`@@ -1175,7 +1175,7 @@ public static GetByteArrayNode create() {`
`1175`	`1175`
`1176`	`1176`	`@Specialization`
`1177`	`1177`	`byte[] doCArrayWrapper(CByteArrayWrapper o, @SuppressWarnings("unused") long size) {`
`1178`		`- return o.getDelegate();`
	`1178`	`+ return o.getByteArray();`
`1179`	`1179`	`}`
`1180`	`1180`
`1181`	`1181`	`@Specialization`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,10 @@ public abstract class CArrayWrappers {`
`53`	`53`
`54`	`54`	`public abstract static class CArrayWrapper extends PythonNativeWrapper {`
`55`	`55`
	`56`	`+ public CArrayWrapper(Object delegate) {`
	`57`	`+ super(delegate);`
	`58`	`+ }`
	`59`	`+`
`56`	`60`	`static boolean isInstance(TruffleObject o) {`
`57`	`61`	`return o instanceof CArrayWrapper;`
`58`	`62`	`}`
`@@ -71,15 +75,12 @@ public ForeignAccess getForeignAccess() {`
`71`	`75`	`*/`
`72`	`76`	`public static class CStringWrapper extends CArrayWrapper {`
`73`	`77`
`74`		`- private final String delegate;`
`75`		`-`
`76`	`78`	`public CStringWrapper(String delegate) {`
`77`		`- this.delegate = delegate;`
	`79`	`+ super(delegate);`
`78`	`80`	`}`
`79`	`81`
`80`		`- @Override`
`81`		`- public String getDelegate() {`
`82`		`- return delegate;`
	`82`	`+ public String getString() {`
	`83`	`+ return (String) getDelegate();`
`83`	`84`	`}`
`84`	`85`
`85`	`86`	`}`
`@@ -90,15 +91,12 @@ public String getDelegate() {`
`90`	`91`	`*/`
`91`	`92`	`public static class CByteArrayWrapper extends CArrayWrapper {`
`92`	`93`
`93`		`- private final byte[] delegate;`
`94`		`-`
`95`	`94`	`public CByteArrayWrapper(byte[] delegate) {`
`96`		`- this.delegate = delegate;`
	`95`	`+ super(delegate);`
`97`	`96`	`}`
`98`	`97`
`99`		`- @Override`
`100`		`- public byte[] getDelegate() {`
`101`		`- return delegate;`
	`98`	`+ public byte[] getByteArray() {`
	`99`	`+ return (byte[]) getDelegate();`
`102`	`100`	`}`
`103`	`101`
`104`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public PythonNativeWrapper(Object delegate) {`
`67`	`67`	`this.delegate = delegate;`
`68`	`68`	`}`
`69`	`69`
`70`		`- public Object getDelegate() {`
	`70`	`+ public final Object getDelegate() {`
`71`	`71`	`return delegate;`
`72`	`72`	`}`
`73`	`73`
`@@ -417,9 +417,8 @@ public PyUnicodeWrapper(PString delegate) {`
`417`	`417`	`super(delegate);`
`418`	`418`	`}`
`419`	`419`
`420`		`- @Override`
`421`		`- public PString getDelegate() {`
`422`		`- return (PString) super.getDelegate();`
	`420`	`+ public PString getPString() {`
	`421`	`+ return (PString) getDelegate();`
`423`	`422`	`}`
`424`	`423`
`425`	`424`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ abstract static class ReadNode extends Node {`
`78`	`78`
`79`	`79`	`public Object access(PyNumberMethodsWrapper object, String key) {`
`80`	`80`	`// translate key to attribute name`
`81`		`- PythonClass delegate = object.getDelegate();`
	`81`	`+ PythonClass delegate = object.getPythonClass();`
`82`	`82`	`return getToSulongNode().execute(readMethodNode.execute(delegate, key));`
`83`	`83`	`}`
`84`	`84`