fix ambigous use of data field in PBaseException

Author: cosminbasca

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/exception/PBaseException.java

@@ -74,6 +74,10 @@
 
 @ExportLibrary(InteropLibrary.class)
 public final class PBaseException extends PythonObject {
+    public static class Data {
+
+    }
+
     private static final ErrorMessageFormatter FORMATTER = new ErrorMessageFormatter();
 
     private PTuple args; // can be null for lazily generated message
@@ -91,9 +95,9 @@ public final class PBaseException extends PythonObject {
     private boolean suppressContext = false;
     // the data instance is used to store additional information for some of the builtin exceptions
     // not unlike subclassing
-    private Object data;
+    private Data data;
 
-    public PBaseException(Object cls, Shape instanceShape, Object data, PTuple args) {
+    public PBaseException(Object cls, Shape instanceShape, Data data, PTuple args) {
         super(cls, instanceShape);
         this.data = data;
         this.args = args;
@@ -102,7 +106,7 @@ public PBaseException(Object cls, Shape instanceShape, Object data, PTuple args)
         this.messageArgs = null;
     }
 
-    public PBaseException(Object cls, Shape instanceShape, Object data) {
+    public PBaseException(Object cls, Shape instanceShape, Data data) {
         super(cls, instanceShape);
         this.data = data;
         this.args = null;
@@ -111,7 +115,7 @@ public PBaseException(Object cls, Shape instanceShape, Object data) {
         this.messageArgs = null;
     }
 
-    public PBaseException(Object cls, Shape instanceShape, Object data, String format, Object[] args) {
+    public PBaseException(Object cls, Shape instanceShape, Data data, String format, Object[] args) {
         super(cls, instanceShape);
         this.data = data;
         this.args = null;
@@ -120,11 +124,11 @@ public PBaseException(Object cls, Shape instanceShape, Object data, String forma
         this.messageArgs = args;
     }
 
-    public Object getData() {
+    public Data getData() {
         return data;
     }
 
-    public void setData(Object data) {
+    public void setData(Data data) {
         this.data = data;
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/exception/SystemExitBuiltins.java

@@ -67,7 +67,7 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
     }
 
     @CompilerDirectives.ValueType
-    public static final class SystemExitData {
+    public static final class SystemExitData extends PBaseException.Data {
         private Object code;
 
         private SystemExitData() {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyTraceBackPrintNode.java

@@ -81,8 +81,8 @@
 import static com.oracle.graal.python.util.PythonUtils.NEW_LINE;
 
 /**
- * Equivalent of {@code PyTraceBack_Print} from CPython.
- * the node contains also a number of utility static methods
+ * Equivalent of {@code PyTraceBack_Print} from CPython. the node contains also a number of utility
+ * static methods
  */
 public abstract class PyTraceBackPrintNode extends PNodeWithContext {
     static final int TRACEBACK_LIMIT = 1000;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PRaiseNode.java

@@ -68,7 +68,7 @@ public final PException execute(Node raisingNode, PythonBuiltinClassType type, O
         return execute(raisingNode, type, null, cause, format, arguments);
     }
 
-    public abstract PException execute(Node raisingNode, PythonBuiltinClassType type, Object data, Object cause, Object format, Object[] arguments);
+    public abstract PException execute(Node raisingNode, PythonBuiltinClassType type, PBaseException.Data data, Object cause, Object format, Object[] arguments);
 
     public final PException raise(PythonBuiltinClassType type) {
         throw execute(this, type, null, PNone.NO_VALUE, PNone.NO_VALUE, PythonUtils.EMPTY_OBJECT_ARRAY);
@@ -86,7 +86,7 @@ public final PException raise(PythonBuiltinClassType type, Object... arguments)
         throw execute(this, type, null, PNone.NO_VALUE, PNone.NO_VALUE, arguments);
     }
 
-    public final PException raiseWithData(PythonBuiltinClassType type, Object data, Object... arguments) {
+    public final PException raiseWithData(PythonBuiltinClassType type, PBaseException.Data data, Object... arguments) {
         throw execute(this, type, data, PNone.NO_VALUE, PNone.NO_VALUE, arguments);
     }
 
@@ -168,7 +168,7 @@ public static PException raise(Node raisingNode, PBaseException exc, boolean wit
     }
 
     @Specialization(guards = {"isNoValue(cause)", "isNoValue(format)", "arguments.length == 0", "exceptionType == cachedType"}, limit = "8")
-    static PException doPythonBuiltinTypeCached(Node raisingNode, @SuppressWarnings("unused") PythonBuiltinClassType exceptionType, Object data, @SuppressWarnings("unused") PNone cause,
+    static PException doPythonBuiltinTypeCached(Node raisingNode, @SuppressWarnings("unused") PythonBuiltinClassType exceptionType, PBaseException.Data data, @SuppressWarnings("unused") PNone cause,
                     @SuppressWarnings("unused") PNone format,
                     @SuppressWarnings("unused") Object[] arguments,
                     @Cached("exceptionType") PythonBuiltinClassType cachedType,
@@ -177,27 +177,29 @@ static PException doPythonBuiltinTypeCached(Node raisingNode, @SuppressWarnings(
     }
 
     @Specialization(guards = {"isNoValue(cause)", "isNoValue(format)", "arguments.length == 0"}, replaces = "doPythonBuiltinTypeCached")
-    static PException doPythonBuiltinType(Node raisingNode, PythonBuiltinClassType exceptionType, Object data, @SuppressWarnings("unused") PNone cause, @SuppressWarnings("unused") PNone format,
+    static PException doPythonBuiltinType(Node raisingNode, PythonBuiltinClassType exceptionType, PBaseException.Data data, @SuppressWarnings("unused") PNone cause,
+                    @SuppressWarnings("unused") PNone format,
                     @SuppressWarnings("unused") Object[] arguments,
                     @Shared("factory") @Cached PythonObjectFactory factory) {
         throw raiseExceptionObject(raisingNode, factory.createBaseException(exceptionType, data));
     }
 
     @Specialization(guards = {"isNoValue(cause)", "isNoValue(format)", "arguments.length > 0"})
-    static PException doBuiltinType(Node raisingNode, PythonBuiltinClassType type, Object data, @SuppressWarnings("unused") PNone cause, @SuppressWarnings("unused") PNone format, Object[] arguments,
+    static PException doBuiltinType(Node raisingNode, PythonBuiltinClassType type, PBaseException.Data data, @SuppressWarnings("unused") PNone cause, @SuppressWarnings("unused") PNone format,
+                    Object[] arguments,
                     @Shared("factory") @Cached PythonObjectFactory factory) {
         throw raiseExceptionObject(raisingNode, factory.createBaseException(type, data, factory.createTuple(arguments)));
     }
 
     @Specialization(guards = {"isNoValue(cause)"})
-    static PException doBuiltinType(Node raisingNode, PythonBuiltinClassType type, Object data, @SuppressWarnings("unused") PNone cause, String format, Object[] arguments,
+    static PException doBuiltinType(Node raisingNode, PythonBuiltinClassType type, PBaseException.Data data, @SuppressWarnings("unused") PNone cause, String format, Object[] arguments,
                     @Shared("factory") @Cached PythonObjectFactory factory) {
         assert format != null;
         throw raiseExceptionObject(raisingNode, factory.createBaseException(type, data, format, arguments));
     }
 
     @Specialization(guards = {"!isNoValue(cause)"})
-    static PException doBuiltinTypeWithCause(Node raisingNode, PythonBuiltinClassType type, Object data, PBaseException cause, String format, Object[] arguments,
+    static PException doBuiltinTypeWithCause(Node raisingNode, PythonBuiltinClassType type, PBaseException.Data data, PBaseException cause, String format, Object[] arguments,
                     @Shared("factory") @Cached PythonObjectFactory factory) {
         assert format != null;
         PBaseException baseException = factory.createBaseException(type, data, format, arguments);

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

@@ -860,24 +860,28 @@ public final PTraceback createTraceback(LazyTraceback tb) {
         return trace(new PTraceback(getLanguage(), tb));
     }
 
-    public final PBaseException createBaseException(Object cls, Object data, PTuple args) {
+    public final PBaseException createBaseException(Object cls, PTuple args) {
+        return createBaseException(cls, null, args);
+    }
+
+    public final PBaseException createBaseException(Object cls, PBaseException.Data data, PTuple args) {
         return trace(new PBaseException(cls, getShape(cls), data, args));
     }
 
     public final PBaseException createBaseException(Object cls, String format, Object[] args) {
         return createBaseException(cls, null, format, args);
     }
 
-    public final PBaseException createBaseException(Object cls, Object data, String format, Object[] args) {
+    public final PBaseException createBaseException(Object cls, PBaseException.Data data, String format, Object[] args) {
         assert format != null;
         return trace(new PBaseException(cls, getShape(cls), data, format, args));
     }
 
     public final PBaseException createBaseException(Object cls) {
-        return createBaseException(cls, null);
+        return trace(new PBaseException(cls, getShape(cls), null));
     }
 
-    public final PBaseException createBaseException(Object cls, Object data) {
+    public final PBaseException createBaseException(Object cls, PBaseException.Data data) {
         return trace(new PBaseException(cls, getShape(cls), data));
     }