Borrow tzinfo from PyDateTime_DATE_GET_TZINFO

Author: msimacek

graalpython/com.oracle.graal.python.cext/include/datetime.h

@@ -119,10 +119,12 @@ typedef struct
 } PyDateTime_DateTime;          /* hastzinfo true */
 
 
+PyObject* PyTruffle_PyDateTime_GET_TZINFO(PyObject*);
+
 /* Apply for date and datetime instances. */
 
 // o is a pointer to a time or a datetime object.
-#define _PyDateTime_HAS_TZINFO(o)  (((_PyDateTime_BaseTZInfo *)(o))->hastzinfo)
+#define _PyDateTime_HAS_TZINFO(o)  (PyTruffle_PyDateTime_GET_TZINFO((PyObject*)o) != Py_None)
 
 #define PyDateTime_GET_YEAR(o)     ((int)PyLong_AsLong(PyObject_GetAttrString((PyObject*)o, "year")))
 #define PyDateTime_GET_MONTH(o)    ((unsigned char)PyLong_AsLong(PyObject_GetAttrString((PyObject*)o, "month")))
@@ -133,17 +135,15 @@ typedef struct
 #define PyDateTime_DATE_GET_SECOND(o)      ((unsigned char)PyLong_AsLong(PyObject_GetAttrString((PyObject*)o, "second")))
 #define PyDateTime_DATE_GET_MICROSECOND(o)              ((int)PyLong_AsLong(PyObject_GetAttrString((PyObject*)o, "microsecond")))
 #define PyDateTime_DATE_GET_FOLD(o)        ((unsigned char)PyLong_AsLong(PyObject_GetAttrString((PyObject*)o, "fold")))
-// TODO borrow
-#define PyDateTime_DATE_GET_TZINFO(o)      (PyObject_GetAttrString((PyObject*)o, "tzinfo"))
+#define PyDateTime_DATE_GET_TZINFO(o)      (PyTruffle_PyDateTime_GET_TZINFO((PyObject*)o))
 
 /* Apply for time instances. */
 #define PyDateTime_TIME_GET_HOUR(o)        ((unsigned char)PyLong_AsLong(PyObject_GetAttrString((PyObject*)o, "hour")))
 #define PyDateTime_TIME_GET_MINUTE(o)      ((unsigned char)PyLong_AsLong(PyObject_GetAttrString((PyObject*)o, "minute")))
 #define PyDateTime_TIME_GET_SECOND(o)      ((unsigned char)PyLong_AsLong(PyObject_GetAttrString((PyObject*)o, "second")))
 #define PyDateTime_TIME_GET_MICROSECOND(o)              ((int)PyLong_AsLong(PyObject_GetAttrString((PyObject*)o, "microsecond")))
 #define PyDateTime_TIME_GET_FOLD(o)        ((unsigned char)PyLong_AsLong(PyObject_GetAttrString((PyObject*)o, "fold")))
-// TODO borrow
-#define PyDateTime_TIME_GET_TZINFO(o)      (PyObject_GetAttrString((PyObject*)o, "tzinfo"))
+#define PyDateTime_TIME_GET_TZINFO(o)      (PyTruffle_PyDateTime_GET_TZINFO((PyObject*)o))
 
 /* Apply for time delta instances */
 #define PyDateTime_DELTA_GET_DAYS(o)         ((int)PyLong_AsLong(PyObject_GetAttrString((PyObject*)o, "days")))

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

@@ -40,11 +40,13 @@
  */
 package com.oracle.graal.python.builtins.modules.cext;
 
+import static com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiCallPath.Direct;
 import static com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiCallPath.Ignored;
 import static com.oracle.graal.python.builtins.objects.cext.capi.PyDateTimeCAPIWrapper.T_FOLD;
 import static com.oracle.graal.python.builtins.objects.cext.capi.PyDateTimeCAPIWrapper.T_FROMTIMESTAMP;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Int;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyObject;
+import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyObjectBorrowed;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyObjectTransfer;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyTypeObject;
 
@@ -57,8 +59,11 @@
 import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiBuiltin;
 import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiQuaternaryBuiltinNode;
 import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiTernaryBuiltinNode;
+import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiUnaryBuiltinNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.PyDateTimeCAPIWrapper;
+import com.oracle.graal.python.builtins.objects.cext.capi.PyDateTimeMRNode;
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
+import com.oracle.graal.python.lib.PyObjectGetAttr;
 import com.oracle.graal.python.lib.PyObjectLookupAttr;
 import com.oracle.graal.python.nodes.argument.keywords.ExpandKeywordStarargsNode;
 import com.oracle.graal.python.nodes.argument.positional.ExecutePositionalStarargsNode;
@@ -162,4 +167,13 @@ static Object values(int hour, int minute, int second, int usecond, Object tzinf
             return call.execute(null, type, new Object[]{hour, minute, second, usecond, tzinfo}, new PKeyword[]{new PKeyword(T_FOLD, fold)});
         }
     }
+
+    @CApiBuiltin(ret = PyObjectBorrowed, args = {PyObject}, call = Direct)
+    abstract static class PyTruffle_PyDateTime_GET_TZINFO extends CApiUnaryBuiltinNode {
+        @Specialization
+        static Object get(Object obj,
+                        @Cached PyObjectGetAttr getAttr) {
+            return getAttr.execute(null, obj, PyDateTimeMRNode.T_TZINFO);
+        }
+    }
 }