prevector: destroy elements only via erase()

kazcw · kazcw · commit 1e2c29f2632c · 2016-04-16T08:05:11.000-07:00
Fixes a bug in which pop_back did not call the deleted item's destructor.

Using the most general erase() implementation to implement all the others
prevents similar bugs because the coupling between deallocation and destructor
invocation only needs to be maintained in one place.
Also reduces duplication of complex memmove logic.
diff --git a/src/prevector.h b/src/prevector.h
@@ -298,9 +298,8 @@ class prevector {
     }
 
     void resize(size_type new_size) {
-        while (size() > new_size) {
-            item_ptr(size() - 1)->~T();
-            _size--;
+        if (size() > new_size) {
+            erase(item_ptr(new_size), end());
         }
         if (new_size > capacity()) {
             change_capacity(new_size);
@@ -368,10 +367,7 @@ class prevector {
     }
 
     iterator erase(iterator pos) {
-        (*pos).~T();
-        memmove(&(*pos), &(*pos) + 1, ((char*)&(*end())) - ((char*)(1 + &(*pos))));
-        _size--;
-        return pos;
+        return erase(pos, pos + 1);
     }
 
     iterator erase(iterator first, iterator last) {
@@ -396,7 +392,7 @@ class prevector {
     }
 
     void pop_back() {
-        _size--;
+        erase(end() - 1, end());
     }
 
     T& front() {

Original file line number	Diff line number	Diff line change
`@@ -298,9 +298,8 @@ class prevector {`
`298`	`298`	`}`
`299`	`299`
`300`	`300`	`void resize(size_type new_size) {`
`301`		`- while (size() > new_size) {`
`302`		`- item_ptr(size() - 1)->~T();`
`303`		`- _size--;`
	`301`	`+ if (size() > new_size) {`
	`302`	`+ erase(item_ptr(new_size), end());`
`304`	`303`	`}`
`305`	`304`	`if (new_size > capacity()) {`
`306`	`305`	`change_capacity(new_size);`
`@@ -368,10 +367,7 @@ class prevector {`
`368`	`367`	`}`
`369`	`368`
`370`	`369`	`iterator erase(iterator pos) {`
`371`		`- (*pos).~T();`
`372`		`- memmove(&(pos), &(pos) + 1, ((char)&(end())) - ((char)(1 + &(pos))));`
`373`		`- _size--;`
`374`		`- return pos;`
	`370`	`+ return erase(pos, pos + 1);`
`375`	`371`	`}`
`376`	`372`
`377`	`373`	`iterator erase(iterator first, iterator last) {`
`@@ -396,7 +392,7 @@ class prevector {`
`396`	`392`	`}`
`397`	`393`
`398`	`394`	`void pop_back() {`
`399`		`- _size--;`
	`395`	`+ erase(end() - 1, end());`
`400`	`396`	`}`
`401`	`397`
`402`	`398`	`T& front() {`