Add invariant to Vec::pop that len < cap if pop successful

Fixes: rust-lang#114334
krtab · Aug 4, 2023 · 3ff159b · 3ff159b
1 parent f475098
commit 3ff159b
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/library/alloc/src/vec/mod.rs b/library/alloc/src/vec/mod.rs
@@ -1903,6 +1903,7 @@ impl<T, A: Allocator> Vec<T, A> {
         } else {
             unsafe {
                 self.len -= 1;
+                core::intrinsics::assume(self.len < self.capacity());
                 Some(ptr::read(self.as_ptr().add(self.len())))
             }
         }

diff --git a/tests/codegen/vec_pop_push_noop.rs b/tests/codegen/vec_pop_push_noop.rs
@@ -0,0 +1,25 @@
+// compile-flags: -O
+
+#![crate_type = "lib"]
+
+#[no_mangle]
+pub fn noop(v: &mut Vec<u8>) {
+    // CHECK: start:
+    // CHECK-NEXT: getelementptr
+    // CHECK-NEXT: load
+    // CHECK-NEXT: icmp eq
+    // CHECK-NEXT: br
+
+    // CHECK: add
+    // CHECK-NEXT: getelementptr
+    // CHECK-NEXT: load
+    // CHECK-NEXT: icmp
+    // CHECK-NEXT: tail call
+    // CHECK-NEXT: br label %bb3
+
+    // CHECK: bb3:
+    // CHECK-NEXT:     ret void
+    if let Some(x) = v.pop() {
+        v.push(x)
+    }
+}