commit 613f64ea2a7e686429ef67d577548d856e7ff253
author Nathan Sidwell <nathan@acm.org> Mon Feb 28 12:04:37 2022 -0800
committer Copybara-Service <copybara-worker@google.com> Tue Mar 01 09:04:17 2022 -0800
tree 740b5e95a8dfdbd30dbe174a1a83a2a8ca084a86
parent b147773e14f4d0dbbb9ced5bb75b7100536bc0a3

[demangler] Simplify SwapAndRestore

The SwapAndRestore class is over engineered.  Nothing makes use of the
early restoration machinery.  Let's just remove that cognative burdon.

Reviewed By: ChuanqiXu

Differential Revision: https://reviews.llvm.org/D120673

GitOrigin-RevId: e5c98e22fbbe3c3eb5f2c782d0789098afc81518

src/demangle/Utility.h

diff --git a/src/demangle/Utility.h b/src/demangle/Utility.h
index 21e5efb..f8190b8 100644
--- a/src/demangle/Utility.h
+++ b/src/demangle/Utility.h
@@ -163,7 +163,6 @@
 template <class T> class SwapAndRestore {
   T &Restore;
   T OriginalValue;
-  bool ShouldRestore = true;
 
 public:
   SwapAndRestore(T &Restore_) : SwapAndRestore(Restore_, Restore_) {}
@@ -172,20 +171,7 @@
       : Restore(Restore_), OriginalValue(Restore) {
     Restore = std::move(NewVal);
   }
-  ~SwapAndRestore() {
-    if (ShouldRestore)
-      Restore = std::move(OriginalValue);
-  }
-
-  void shouldRestore(bool ShouldRestore_) { ShouldRestore = ShouldRestore_; }
-
-  void restoreNow(bool Force) {
-    if (!Force && !ShouldRestore)
-      return;
-
-    Restore = std::move(OriginalValue);
-    ShouldRestore = false;
-  }
+  ~SwapAndRestore() { Restore = std::move(OriginalValue); }
 
   SwapAndRestore(const SwapAndRestore &) = delete;
   SwapAndRestore &operator=(const SwapAndRestore &) = delete;