Revert " [3/N] Fix cppcoreguidelines-special-member-functions warnings (#138796)"

pytorchmergebot · pytorchmergebot · commit 9ca749d6cd08 · 2024-10-28T07:06:00.000Z
This reverts commit 7cb3cef. Reverted #138796 on behalf of https://github.com/wdvr due to reverting since this started failing a windows test ([comment](#138796 (comment)))
diff --git a/aten/src/ATen/TensorIterator.cpp b/aten/src/ATen/TensorIterator.cpp
@@ -1483,6 +1483,8 @@ FastSetupType TensorIteratorBase::compute_fast_setup_type(const TensorIteratorCo
   return FastSetupType::NONE;
 }
 
+TensorIteratorBase::TensorIteratorBase() = default;
+
 void TensorIteratorBase::build(TensorIteratorConfig& config) {
   // populate some persistent configuration fields
   is_reduction_ = config.is_reduction_;
diff --git a/aten/src/ATen/TensorIterator.h b/aten/src/ATen/TensorIterator.h
@@ -250,6 +250,7 @@ struct TORCH_API TensorIteratorBase : public impl::MetaBase {
   using PtrVector = SmallVector<char*, 4>;
   using StrideVector = SmallVector<int64_t, 6>;
 
+  TensorIteratorBase();
   void build(TensorIteratorConfig&);
 
   // The inner-loop function operates on the fastest moving dimension. It
@@ -787,9 +788,6 @@ class TORCH_API TensorIteratorConfig final {
   TensorIteratorConfig() = default;
 
   C10_DISABLE_COPY_AND_ASSIGN(TensorIteratorConfig);
-  TensorIteratorConfig(TensorIteratorConfig&&) = default;
-  TensorIteratorConfig& operator=(TensorIteratorConfig&&) = default;
-  ~TensorIteratorConfig() = default;
 
   /// Construction
   // Stores input/output Tensors without incrementing the reference count.
@@ -999,8 +997,6 @@ struct TORCH_API SplitUntil32Bit {
     iterator() = default;
     iterator(const TensorIteratorBase& iter);
     iterator(iterator&&) = default;
-    iterator& operator=(iterator&&) = default;
-    ~iterator() = default;
 
     // Guaranteed to be a TensorIterator proper!
     TensorIterator& operator*() const;
diff --git a/aten/src/ATen/code_template.h b/aten/src/ATen/code_template.h
@@ -19,10 +19,7 @@ namespace at::jit {
 struct TemplateEnv {
   TemplateEnv() = default;
   TemplateEnv(TemplateEnv& parent) : parent(&parent) {}
-  TemplateEnv(TemplateEnv&&) = delete;
   TemplateEnv& operator=(const TemplateEnv& parent) = delete;
-  TemplateEnv& operator=(TemplateEnv&& parent) = delete;
-  ~TemplateEnv() = default;
 
   using string_list = std::vector<std::string>;
 
diff --git a/aten/src/ATen/core/Array.h b/aten/src/ATen/core/Array.h
@@ -23,16 +23,10 @@ struct Array {
   C10_HOST_DEVICE Array() = default;
   C10_HOST_DEVICE Array(const Array&) = default;
   C10_HOST_DEVICE Array& operator=(const Array&) = default;
-  C10_HOST_DEVICE Array(Array&&) = default;
-  C10_HOST_DEVICE Array& operator=(Array&&) = default;
-  C10_HOST_DEVICE ~Array() = default;
 #else
   Array() = default;
   Array(const Array&) = default;
   Array& operator=(const Array&) = default;
-  Array(Array&&) = default;
-  Array& operator=(Array&&) = default;
-  ~Array() = default;
 #endif
   static constexpr int size() {
     return size_;
diff --git a/aten/src/ATen/core/Dict.h b/aten/src/ATen/core/Dict.h
@@ -83,7 +83,6 @@ class DictEntryRef final {
     static_assert(std::is_constructible_v<Value, Value_>, "Wrong type for the value argument of setValue()");
     iterator_->second = Value(std::forward<Value_>(value));
   }
-  ~DictEntryRef() = default;
 
 private:
   // allow copying and moving, but only our friends (i.e. the Dict class) can do
diff --git a/aten/src/ATen/core/Formatting.cpp b/aten/src/ATen/core/Formatting.cpp
@@ -50,20 +50,16 @@ inline std::ios_base& defaultfloat(std::ios_base& __base) {
 //saves/restores number formatting inside scope
 struct FormatGuard {
   FormatGuard(std::ostream & out)
-  : out(out) {
+  : out(out), saved(nullptr) {
     saved.copyfmt(out);
   }
   ~FormatGuard() {
     out.copyfmt(saved);
   }
-  FormatGuard(const FormatGuard&) = delete;
-  FormatGuard(FormatGuard&&) = delete;
-  FormatGuard& operator=(const FormatGuard&) = delete;
-  FormatGuard& operator=(FormatGuard&&) = delete;
 private:
   // NOLINTNEXTLINE(cppcoreguidelines-avoid-const-or-ref-data-members)
   std::ostream & out;
-  std::ios saved{nullptr};
+  std::ios saved;
 };
 
 std::ostream& operator<<(std::ostream & out, const DeprecatedTypeProperties& t) {
diff --git a/aten/src/ATen/core/List.h b/aten/src/ATen/core/List.h
@@ -88,7 +88,6 @@ class ListElementReference final {
 
   ListElementReference(const ListElementReference&) = delete;
   ListElementReference& operator=(const ListElementReference&) = delete;
-  ~ListElementReference() = default;
 
 private:
   ListElementReference(Iterator iter)
@@ -274,9 +273,6 @@ class List final {
 
   List(const List&) = default;
   List& operator=(const List&) = default;
-  List(List&&) = default;
-  List& operator=(List&&) = default;
-  ~List() = default;
 
   /**
    * Create a new List pointing to a deep copy of the same data.
diff --git a/aten/src/ATen/core/List_test.cpp b/aten/src/ATen/core/List_test.cpp
@@ -3,7 +3,7 @@
 
 using namespace c10;
 
-// NOLINTBEGIN(performance-move-const-arg, bugprone-use-after-move, *analyzer*Move)
+// NOLINTBEGIN(performance-move-const-arg, bugprone-use-after-move)
 TEST(ListTestIValueBasedList, givenEmptyList_whenCallingEmpty_thenReturnsTrue) {
     List<string> list;
     EXPECT_TRUE(list.empty());
@@ -1162,4 +1162,4 @@ TEST(ListTest, toTypedList) {
   genericList = impl::toList(std::move(stringList));
   EXPECT_THROW(c10::impl::toTypedList<int64_t>(std::move(genericList)), c10::Error);
 }
-// NOLINTEND(performance-move-const-arg, bugprone-use-after-move, *analyzer*Move)
+// NOLINTEND(performance-move-const-arg, bugprone-use-after-move)
diff --git a/aten/src/ATen/core/NamedTensor.h b/aten/src/ATen/core/NamedTensor.h
@@ -82,10 +82,6 @@ struct TORCH_API NoNamesGuard {
   NoNamesGuard() : prev_mode(NamesMode::is_enabled()) {
     NamesMode::set_enabled(false);
   }
-  NoNamesGuard(const NoNamesGuard&) = delete;
-  NoNamesGuard(NoNamesGuard&&) = delete;
-  NoNamesGuard& operator=(const NoNamesGuard&) = delete;
-  NoNamesGuard& operator=(NoNamesGuard&&) = delete;
   ~NoNamesGuard() {
     if (initialized) {
       reset();
diff --git a/aten/src/ATen/core/PythonFallbackKernel.cpp b/aten/src/ATen/core/PythonFallbackKernel.cpp
@@ -35,10 +35,6 @@ struct StashTLSOnEntryGuard {
   StashTLSOnEntryGuard(): saved_(tls_on_entry.value()) {
     tls_on_entry = std::nullopt;
   }
-  StashTLSOnEntryGuard(const StashTLSOnEntryGuard&) = delete;
-  StashTLSOnEntryGuard(StashTLSOnEntryGuard&&) = delete;
-  StashTLSOnEntryGuard& operator=(const StashTLSOnEntryGuard&) = delete;
-  StashTLSOnEntryGuard& operator=(StashTLSOnEntryGuard&&) = delete;
 
   ~StashTLSOnEntryGuard() {
     TORCH_INTERNAL_ASSERT(!tls_on_entry.has_value());
diff --git a/aten/src/ATen/core/function_schema.h b/aten/src/ATen/core/function_schema.h
@@ -82,7 +82,6 @@ struct TORCH_API Argument {
     }
     return *this;
   }
-  ~Argument() = default;
 
   const std::string& name() const {
     return name_;
diff --git a/aten/src/ATen/core/ivalue.h b/aten/src/ATen/core/ivalue.h
@@ -1352,13 +1352,8 @@ struct TORCH_API IValue final {
         DeviceIndex index;
       } as_device;
     } u;
-    static_assert(std::is_trivially_copyable_v<TriviallyCopyablePayload>);
     at::Tensor as_tensor;
     Payload() : u() {}
-    Payload(const Payload&) = delete;
-    Payload(Payload&&) = delete;
-    Payload& operator=(const Payload&) = delete;
-    Payload& operator=(Payload&&) = delete;
     ~Payload() {}
   };
 
diff --git a/torch/csrc/cuda/CUDAPluggableAllocator.h b/torch/csrc/cuda/CUDAPluggableAllocator.h
@@ -73,11 +73,7 @@ struct TORCH_CUDA_CPP_API CUDAPluggableAllocator
       std::function<FreeFuncType> free_fn);
 
   CUDAPluggableAllocator(CUDAPluggableAllocator& other);
-  CUDAPluggableAllocator(CUDAPluggableAllocator&& other) = delete;
-  CUDAPluggableAllocator& operator=(const CUDAPluggableAllocator& other) =
-      delete;
-  CUDAPluggableAllocator& operator=(CUDAPluggableAllocator&& other) = delete;
-  ~CUDAPluggableAllocator() override = default;
+  CUDAPluggableAllocator& operator=(CUDAPluggableAllocator& other) = delete;
 
   void set_init_fn(std::function<void(int)> init_fn);
 
diff --git a/torch/csrc/profiler/collection.h b/torch/csrc/profiler/collection.h
@@ -57,7 +57,6 @@ struct TORCH_API RawTensorMetadata : RawTensorMetadataBase {
   RawTensorMetadata(RawTensorMetadata&&) noexcept = default;
   RawTensorMetadata& operator=(const RawTensorMetadata&) = default;
   RawTensorMetadata& operator=(RawTensorMetadata&&) noexcept = default;
-  ~RawTensorMetadata() = default;
   explicit RawTensorMetadata(const at::Tensor& t);
 
   // Wrap `weak_self_` in `std::optional` and split device into components to
diff --git a/torch/csrc/profiler/perf.h b/torch/csrc/profiler/perf.h
@@ -37,8 +37,6 @@ class PerfEvent {
  public:
   explicit PerfEvent(std::string& name) : name_(name) {}
 
-  PerfEvent(const PerfEvent& other) = delete;
-  PerfEvent& operator=(const PerfEvent&) = delete;
   PerfEvent& operator=(PerfEvent&& other) noexcept {
     if (this != &other) {
       fd_ = other.fd_;
diff --git a/torch/csrc/profiler/standalone/privateuse1_observer.h b/torch/csrc/profiler/standalone/privateuse1_observer.h
@@ -12,10 +12,6 @@ struct PushPRIVATEUSE1CallbacksStub {
   PushPRIVATEUSE1CallbacksStub(const PushPRIVATEUSE1CallbacksStub&) = delete;
   PushPRIVATEUSE1CallbacksStub& operator=(const PushPRIVATEUSE1CallbacksStub&) =
       delete;
-  PushPRIVATEUSE1CallbacksStub(PushPRIVATEUSE1CallbacksStub&&) = default;
-  PushPRIVATEUSE1CallbacksStub& operator=(PushPRIVATEUSE1CallbacksStub&&) =
-      default;
-  ~PushPRIVATEUSE1CallbacksStub() = default;
 
   template <typename... ArgTypes>
   void operator()(ArgTypes&&... args) {
diff --git a/torch/csrc/utils/object_ptr.h b/torch/csrc/utils/object_ptr.h
@@ -10,8 +10,6 @@ class TORCH_PYTHON_API THPPointer {
   THPPointer() : ptr(nullptr){};
   explicit THPPointer(T* ptr) noexcept : ptr(ptr){};
   THPPointer(THPPointer&& p) noexcept : ptr(std::exchange(p.ptr, nullptr)) {}
-  THPPointer(const THPPointer& p) = delete;
-  THPPointer& operator=(const THPPointer&) = delete;
 
   ~THPPointer() {
     free();
diff --git a/torch/csrc/utils/throughput_benchmark.h b/torch/csrc/utils/throughput_benchmark.h
@@ -103,7 +103,6 @@ struct C10_HIDDEN ModuleInput {
   ModuleInput(const ModuleInput&) = delete;
   ModuleInput& operator=(ModuleInput& other) = delete;
   ModuleInput& operator=(ModuleInput&& other) = delete;
-  ~ModuleInput() = default;
 
   ModuleInput(py::args&& args, py::kwargs&& kwargs)
       : args(std::move(args)), kwargs(std::move(kwargs)) {}

Original file line number	Diff line number	Diff line change
`@@ -1483,6 +1483,8 @@ FastSetupType TensorIteratorBase::compute_fast_setup_type(const TensorIteratorCo`
`1483`	`1483`	`return FastSetupType::NONE;`
`1484`	`1484`	`}`
`1485`	`1485`
	`1486`	`+TensorIteratorBase::TensorIteratorBase() = default;`
	`1487`	`+`
`1486`	`1488`	`void TensorIteratorBase::build(TensorIteratorConfig& config) {`
`1487`	`1489`	`// populate some persistent configuration fields`
`1488`	`1490`	`is_reduction_ = config.is_reduction_;`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,6 @@ class DictEntryRef final {`
`83`	`83`	`static_assert(std::is_constructible_v<Value, Value_>, "Wrong type for the value argument of setValue()");`
`84`	`84`	`iterator_->second = Value(std::forward<Value_>(value));`
`85`	`85`	`}`
`86`		`- ~DictEntryRef() = default;`
`87`	`86`
`88`	`87`	`private:`
`89`	`88`	`// allow copying and moving, but only our friends (i.e. the Dict class) can do`