Make sure Variant's value constructor doesn't shadow move constructor.

chipsalliance · May 10, 2022 · 818c6b4 · 818c6b4
1 parent 121e80b
commit 818c6b4
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/common/util/variant.h b/common/util/variant.h
@@ -281,7 +281,9 @@ class Variant {
   constexpr Variant(Variant&& other) noexcept { Construct(std::move(other)); }
 
   // TODO(mglb): enable conditionally
-  template <class T, std::enable_if_t<type_list_contains_v<T>>* = nullptr>
+  template <class T,
+            std::enable_if_t<!std::is_same_v<Variant, remove_cvref_t<T>> &&
+                             type_list_contains_v<T>>* = nullptr>
   constexpr explicit Variant(T&& obj) noexcept {
     Construct(std::forward<T>(obj));
   }