Refactor vector move-ctor with allocator

winner245 · winner245 · commit e81abcc0d06d · 2024-11-25T15:34:43.000-05:00
diff --git a/libcxx/include/__vector/vector.h b/libcxx/include/__vector/vector.h
@@ -964,9 +964,7 @@ vector<_Tp, _Allocator>::vector(vector&& __x, const __type_identity_t<allocator_
     __x.__begin_ = __x.__end_ = __x.__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
`@@ -964,9 +964,7 @@ vector<_Tp, _Allocator>::vector(vector&& __x, const __type_identity_t<allocator_`
`964`	`964`	`__x.__begin_ = __x.__end_ = __x.__cap_ = nullptr;`
`965`	`965`	`} else {`
`966`	`966`	`typedef move_iterator<iterator> _Ip;`
`967`		`- auto __guard = std::__make_exception_guard(__destroy_vector(*this));`
`968`		`- assign(_Ip(__x.begin()), _Ip(__x.end()));`
`969`		`- __guard.__complete();`
	`967`	`+ __init_with_size(_Ip(__x.begin()), _Ip(__x.end()), __x.size());`
`970`	`968`	`}`
`971`	`969`	`}`
`972`	`970`