Refactor vector move-ctor with allocator

winner245 · winner245 · commit 85b11699c914 · 2024-11-15T22:46:21.000-05:00
diff --git a/libcxx/include/__vector/vector.h b/libcxx/include/__vector/vector.h
@@ -976,9 +976,7 @@ vector<_Tp, _Allocator>::vector(vector&& __x, const __type_identity_t<allocator_
     __x.__begin_ = __x.__end_ = __x.__end_cap() = nullptr;
   } else {
     typedef move_iterator<iterator> _Ip;
-    auto __guard = std::__make_exception_guard(__destroy_vector(*this));
-    assign(_Ip(__x.begin()), _Ip(__x.end()));
-    __guard.__complete();
+    __init_with_size(_Ip(__x.begin()), _Ip(__x.end()), __x.size());
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -976,9 +976,7 @@ vector<_Tp, _Allocator>::vector(vector&& __x, const __type_identity_t<allocator_`
`976`	`976`	`__x.__begin_ = __x.__end_ = __x.__end_cap() = nullptr;`
`977`	`977`	`} else {`
`978`	`978`	`typedef move_iterator<iterator> _Ip;`
`979`		`- auto __guard = std::__make_exception_guard(__destroy_vector(*this));`
`980`		`- assign(_Ip(__x.begin()), _Ip(__x.end()));`
`981`		`- __guard.__complete();`
	`979`	`+ __init_with_size(_Ip(__x.begin()), _Ip(__x.end()), __x.size());`
`982`	`980`	`}`
`983`	`981`	`}`
`984`	`982`