Avoid taking address of memoryviews to enable C compiler optimizations in user code

Cython/Compiler/PyrexTypes.py

@@ -645,7 +645,7 @@ class MemoryViewSliceType(PyrexType):
 
         tup = (obj.result(), self.ndim, to_py_func, from_py_func,
                self.dtype.is_pyobject)
-        return "__pyx_memoryview_fromslice(&%s, %s, %s, %s, %d);" % tup
+        return "__pyx_memoryview_fromslice(%s, %s, %s, %s, %d);" % tup
 
     def dtype_object_conversion_funcs(self, env):
         import MemoryView, Code

Cython/Utility/MemoryView.pyx

@@ -707,8 +707,12 @@ cdef memoryview memview_slice(memoryview memview, object indices):
 
     for dim, index in enumerate(indices):
         if PyIndex_Check(index):
-            slice_memviewslice(p_src, p_dst, dim, new_ndim, p_suboffset_dim,
-                               index, 0, 0, 0, 0, 0, False)
+            slice_memviewslice(
+                p_dst, p_src.shape[dim], p_src.strides[dim], p_src.suboffsets[dim],
+                dim, new_ndim, p_suboffset_dim,
+                index, 0, 0, # start, stop, step
+                0, 0, 0, # have_{start,stop,step}
+                False)
         else:
             start = index.start or 0
             stop = index.stop or 0
@@ -718,18 +722,21 @@ cdef memoryview memview_slice(memoryview memview, object indices):
             have_stop = index.stop is not None
             have_step = index.step is not None
 
-            slice_memviewslice(p_src, p_dst, dim, new_ndim, p_suboffset_dim,
-                               start, stop, step, have_start, have_stop, have_step,
+            slice_memviewslice(
+                p_dst, p_src.shape[dim], p_src.strides[dim], p_src.suboffsets[dim],
+                dim, new_ndim, p_suboffset_dim,
+                start, stop, step,
+                have_start, have_stop, have_step,
                 True)
             new_ndim += 1
 
     if isinstance(memview, _memoryviewslice):
-        return memoryview_fromslice(&dst, new_ndim,
+        return memoryview_fromslice(dst, new_ndim,
                                     memviewsliceobj.to_object_func,
                                     memviewsliceobj.to_dtype_func,
                                     memview.dtype_is_object)
     else:
-        return memoryview_fromslice(&dst, new_ndim, NULL, NULL,
+        return memoryview_fromslice(dst, new_ndim, NULL, NULL,
                                     memview.dtype_is_object)
 
 
@@ -754,17 +761,12 @@ cdef extern from "pystate.h":
     PyObject *PyErr_Format(PyObject *exc, char *msg, ...) nogil
 
 @cname('__pyx_memoryview_slice_memviewslice')
-cdef int slice_memviewslice({{memviewslice_name}} *src,
+cdef int slice_memviewslice(
         {{memviewslice_name}} *dst,
-                              int dim,
-                              int new_ndim,
-                              int *suboffset_dim,
-                              Py_ssize_t start,
-                              Py_ssize_t stop,
-                              Py_ssize_t step,
-                              int have_start,
-                              int have_stop,
-                              int have_step,
+        Py_ssize_t shape, Py_ssize_t stride, Py_ssize_t suboffset,
+        int dim, int new_ndim, int *suboffset_dim,
+        Py_ssize_t start, Py_ssize_t stop, Py_ssize_t step,
+        int have_start, int have_stop, int have_step,
         bint is_slice) nogil except -1:
     """
     Create a new slice dst given slice src.
@@ -776,14 +778,8 @@ cdef int slice_memviewslice({{memviewslice_name}} *src,
                       where slicing offsets should be added
     """
 
-    cdef:
-        Py_ssize_t shape, stride, suboffset
-        Py_ssize_t new_shape
-        bint negative_step
-
-    shape = src.shape[dim]
-    stride = src.strides[dim]
-    suboffset = src.suboffsets[dim]
+    cdef Py_ssize_t new_shape
+    cdef bint negative_step
 
     if not is_slice:
         # index is a normal integer-like index
@@ -958,7 +954,7 @@ cdef class _memoryviewslice(memoryview):
 
 
 @cname('__pyx_memoryview_fromslice')
-cdef memoryview_fromslice({{memviewslice_name}} *memviewslice,
+cdef memoryview_fromslice({{memviewslice_name}} memviewslice,
                           int ndim,
                           object (*to_object_func)(char *),
                           int (*to_dtype_func)(char *, object) except 0,
@@ -975,8 +971,8 @@ cdef memoryview_fromslice({{memviewslice_name}} *memviewslice,
 
     result = _memoryviewslice(None, 0, dtype_is_object)
 
-    result.from_slice = memviewslice[0]
-    __PYX_INC_MEMVIEW(memviewslice, 1)
+    result.from_slice = memviewslice
+    __PYX_INC_MEMVIEW(&memviewslice, 1)
 
     result.from_object = (<memoryview> memviewslice.memview).base
     result.typeinfo = memviewslice.memview.typeinfo
@@ -1055,7 +1051,7 @@ cdef memoryview_copy_from_slice(memoryview memview, {{memviewslice_name}} *memvi
         to_object_func = NULL
         to_dtype_func = NULL
 
-    return memoryview_fromslice(memviewslice, memview.view.ndim,
+    return memoryview_fromslice(memviewslice[0], memview.view.ndim,
                                 to_object_func, to_dtype_func,
                                 memview.dtype_is_object)
 

Cython/Utility/MemoryView_C.c

@@ -655,6 +655,8 @@ int {{set_function}}(const char *itemp, PyObject *obj); /* proto */
 /////////////// MemviewDtypeToObject ///////////////
 {{#__pyx_memview_<dtype_name>_to_object}}
 
+/* Convert a dtype to or from a Python object */
+
 {{if to_py_function}}
 PyObject *{{get_function}}(const char *itemp) {
     return (PyObject *) {{to_py_function}}(*({{dtype}} *) itemp);
@@ -672,6 +674,7 @@ int {{set_function}}(const char *itemp, PyObject *obj) {
 {{endif}}
 
 /////////////// MemviewObjectToObject.proto ///////////////
+/* Function callbacks (for memoryview object) for dtype object */
 PyObject *{{get_function}}(const char *itemp); /* proto */
 int {{set_function}}(const char *itemp, PyObject *obj); /* proto */
 
@@ -693,8 +696,8 @@ int {{set_function}}(const char *itemp, PyObject *obj) {
 /* Dimension is indexed with 'start:stop:step' */
 
 if (unlikely(__pyx_memoryview_slice_memviewslice(
-    &{{src}},
     &{{dst}},
+    {{src}}.shape[{{dim}}], {{src}}.strides[{{dim}}], {{src}}.suboffsets[{{dim}}],
     {{dim}},
     {{new_ndim}},
     &{{suboffset_dim}},
@@ -793,6 +796,8 @@ __pyx_fill_slice_{{dtype_name}}({{type_decl}} *p, Py_ssize_t extent, Py_ssize_t
 
 ////////// FillStrided1DScalar //////////
 /* Fill a slice with a scalar value. The dimension is direct and strided or contiguous */
+/* This can be used as a callback for the memoryview object to efficienty assign a scalar */
+/* Currently unused */
 static void
 __pyx_fill_slice_{{dtype_name}}({{type_decl}} *p, Py_ssize_t extent, Py_ssize_t stride,
                                 size_t itemsize, void *itemp)