Revert "Fix tensor.data_ptr() representation overflow (#135567)"

pytorchmergebot · pytorchmergebot · commit 538ee7bf600f · 2024-09-24T12:59:14.000Z
This reverts commit 2e8d431. Reverted #135567 on behalf of https://github.com/etaf due to Block XPU, let's re-land with triton update. ([comment](#135567 (comment)))
diff --git a/torch/csrc/StorageMethods.cpp b/torch/csrc/StorageMethods.cpp
@@ -49,14 +49,17 @@ static PyObject* THPStorage_nbytes(PyObject* self, PyObject* noargs) {
 
 static PyObject* THPStorage_dataPtr(PyObject* self, PyObject* noargs) {
   HANDLE_TH_ERRORS
+  // PyLong_FromVoidPtr should not need to mutate the pointer in order
+  // to extract a new long object from it.
+
   auto self_ = THPStorage_Unpack(self);
   // See Note [Invalid Python Storages]
   auto invalid = self_.data() == nullptr &&
       self_.device_type() != c10::DeviceType::Meta && self_.sym_nbytes() != 0;
   TORCH_CHECK(
       !invalid,
       "Attempted to access the data pointer on an invalid python storage.")
-  return torch::autograd::utils::wrap(self_.mutable_data());
+  return PyLong_FromVoidPtr(self_.mutable_data());
   END_HANDLE_TH_ERRORS
 }
 
diff --git a/torch/csrc/autograd/utils/wrap_outputs.h b/torch/csrc/autograd/utils/wrap_outputs.h
@@ -47,7 +47,7 @@ inline PyObject* wrap(c10::complex<double> value) {
 }
 
 inline PyObject* wrap(void* value) {
-  return PyLong_FromVoidPtr(value);
+  return THPUtils_packInt64(reinterpret_cast<intptr_t>(value));
 }
 
 inline PyObject* wrap(THPDtype* dtype) {
