[Fix] avoid unexpected throw in AttrInitEntry (#6128)

apache · Aug 3, 2020 · 84e3c19 · 84e3c19
1 parent 3684a51
commit 84e3c19
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/include/tvm/ir/attrs.h b/include/tvm/ir/attrs.h
@@ -337,6 +337,18 @@ struct AttrInitEntry {
   T* value_;
   // whether the value is missing.
   bool value_missing_{true};
+
+  AttrInitEntry() = default;
+
+  AttrInitEntry(AttrInitEntry&& other) {
+    type_key_ = other.type_key_;
+    key_ = other.key_;
+    value_ = other.value_;
+    value_missing_ = other.value_missing_;
+    // avoid unexpected throw
+    other.value_missing_ = false;
+  }
+
   // If the value is still missing in destruction time throw an error.
   ~AttrInitEntry() DMLC_THROW_EXCEPTION {
     if (value_missing_) {
@@ -463,7 +475,7 @@ class AttrInitVisitor {
     } else {
       opt.value_missing_ = true;
     }
-    return opt;
+    return std::move(opt);
   }
 
  private: