Fix compiler warnings on Py_SET_REFCNT() (#3236)

vstinner · web-flow · commit 753197c3f760 · 2022-02-08T13:40:09.000-08:00
Cast `size_t` to `Py_ssize_t` to avoid compiler warnings in `Py_SET_REFCNT()`.
diff --git a/src/core/buffer.cc b/src/core/buffer.cc
@@ -930,7 +930,7 @@ class Mmap_BufferImpl : public BufferImpl, MemoryMapWorker {
       for (size_t i = 0; i < n; ++i) {
         data[i] = Py_None;
       }
-      Py_SET_REFCNT(Py_None, Py_REFCNT(Py_None) + n);
+      Py_SET_REFCNT(Py_None, Py_REFCNT(Py_None) + static_cast<Py_ssize_t>(n));
     }
     impl_->contains_pyobjects_ = true;
     return *this;
@@ -955,7 +955,7 @@ class Mmap_BufferImpl : public BufferImpl, MemoryMapWorker {
           if (n_new > n_old) {
             PyObject** data = static_cast<PyObject**>(xptr());
             for (size_t i = n_old; i < n_new; ++i) data[i] = Py_None;
-            Py_SET_REFCNT(Py_None, Py_REFCNT(Py_None) + n_new - n_old);
+            Py_SET_REFCNT(Py_None, Py_REFCNT(Py_None) + static_cast<Py_ssize_t>(n_new - n_old));
           }
         } else {
           impl_->resize(newsize);
@@ -1019,7 +1019,7 @@ class Mmap_BufferImpl : public BufferImpl, MemoryMapWorker {
         size_t i = 0;
         for (; i < n_copy; ++i) Py_INCREF(newdata[i]);
         for (; i < n_new; ++i) newdata[i] = Py_None;
-        Py_SET_REFCNT(Py_None, Py_REFCNT(Py_None) + n_new - n_copy);
+        Py_SET_REFCNT(Py_None, Py_REFCNT(Py_None) + static_cast<Py_ssize_t>(n_new - n_copy));
       }
       impl_->release();  // noexcept
     }
diff --git a/src/core/column/const_na.cc b/src/core/column/const_na.cc
@@ -85,7 +85,7 @@ static Column _fw_col(size_t nrows, SType stype) {
     });
 
   if (std::is_same<T, PyObject*>::value) {
-    Py_SET_REFCNT(Py_None, Py_REFCNT(Py_None) + nrows);
+    Py_SET_REFCNT(Py_None, Py_REFCNT(Py_None) + static_cast<Py_ssize_t>(nrows));
     buf.set_pyobjects(/* clear_data= */ false);
   }
   return Column(new ColClass(nrows, stype, std::move(buf)));
@@ -102,7 +102,7 @@ static Column _special_col(size_t nrows) {
     });
 
   if (std::is_same<T, PyObject*>::value) {
-    Py_SET_REFCNT(Py_None, Py_REFCNT(Py_None) + nrows);
+    Py_SET_REFCNT(Py_None, Py_REFCNT(Py_None) + static_cast<Py_ssize_t>(nrows));
     buf.set_pyobjects(/* clear_data= */ false);
   }
   return Column(new ColClass(nrows, std::move(buf)));

Original file line number	Diff line number	Diff line change
`@@ -930,7 +930,7 @@ class Mmap_BufferImpl : public BufferImpl, MemoryMapWorker {`
`930`	`930`	`for (size_t i = 0; i < n; ++i) {`
`931`	`931`	`data[i] = Py_None;`
`932`	`932`	`}`
`933`		`- Py_SET_REFCNT(Py_None, Py_REFCNT(Py_None) + n);`
	`933`	`+ Py_SET_REFCNT(Py_None, Py_REFCNT(Py_None) + static_cast<Py_ssize_t>(n));`
`934`	`934`	`}`
`935`	`935`	`impl_->contains_pyobjects_ = true;`
`936`	`936`	`return *this;`
`@@ -955,7 +955,7 @@ class Mmap_BufferImpl : public BufferImpl, MemoryMapWorker {`
`955`	`955`	`if (n_new > n_old) {`
`956`	`956`	`PyObject data = static_cast<PyObject>(xptr());`
`957`	`957`	`for (size_t i = n_old; i < n_new; ++i) data[i] = Py_None;`
`958`		`- Py_SET_REFCNT(Py_None, Py_REFCNT(Py_None) + n_new - n_old);`
	`958`	`+ Py_SET_REFCNT(Py_None, Py_REFCNT(Py_None) + static_cast<Py_ssize_t>(n_new - n_old));`
`959`	`959`	`}`
`960`	`960`	`} else {`
`961`	`961`	`impl_->resize(newsize);`
`@@ -1019,7 +1019,7 @@ class Mmap_BufferImpl : public BufferImpl, MemoryMapWorker {`
`1019`	`1019`	`size_t i = 0;`
`1020`	`1020`	`for (; i < n_copy; ++i) Py_INCREF(newdata[i]);`
`1021`	`1021`	`for (; i < n_new; ++i) newdata[i] = Py_None;`
`1022`		`- Py_SET_REFCNT(Py_None, Py_REFCNT(Py_None) + n_new - n_copy);`
	`1022`	`+ Py_SET_REFCNT(Py_None, Py_REFCNT(Py_None) + static_cast<Py_ssize_t>(n_new - n_copy));`
`1023`	`1023`	`}`
`1024`	`1024`	`impl_->release(); // noexcept`
`1025`	`1025`	`}`