dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-19 12:19:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(transformer): fix debug assertion in Stack (#6106)

Browse source 
Fix incorrect debug assertion in `Stack`. The code itself was fine, but debug assertion was testing the wrong thing.

This error was spotted by @Boshen: https://github.com/oxc-project/oxc/pull/6095#pullrequestreview-2332830541

Also add more debug asserts and change test so it fails before the fix in this PR.
This commit is contained in:
overlookmotel 2024-09-27 11:24:09 +00:00
parent 05852a04ed
commit 64d4756af9
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
crates/oxc_transformer/src/helpers/stack/standard.rs
View file

@ -181,6 +181,9 @@ impl<T> Stack<T> {
/// Stack must not be empty.
#[inline]
pub unsafe fn last_unchecked(&self) -> &T {
debug_assert!(self.end > self.start);
debug_assert!(self.cursor > self.start);
debug_assert!(self.cursor <= self.end);
// SAFETY: All methods ensure `self.cursor` is always in bounds, is aligned for `T`,
// and `self.current.sub(1)` points to a valid initialized `T`, if stack is not empty.
// Caller guarantees stack is not empty.
@ -206,6 +209,9 @@ impl<T> Stack<T> {
/// Stack must not be empty.
#[inline]
pub unsafe fn last_mut_unchecked(&mut self) -> &mut T {
debug_assert!(self.end > self.start);
debug_assert!(self.cursor > self.start);
debug_assert!(self.cursor <= self.end);
// SAFETY: All methods ensure `self.cursor` is always in bounds, is aligned for `T`,
// and `self.current.sub(1)` points to a valid initialized `T`, if stack is not empty.
// Caller guarantees stack is not empty.
@ -337,8 +343,9 @@ impl<T> Stack<T> {
/// Stack must not be empty.
#[inline]
pub unsafe fn pop_unchecked(&mut self) -> T {
debug_assert!(self.end > self.start);
debug_assert!(self.cursor > self.start);
debug_assert!(self.cursor < self.end);
debug_assert!(self.cursor <= self.end);
// SAFETY: Caller guarantees stack is not empty, so subtracting 1 cannot be out of bounds
self.cursor = NonNull::new_unchecked(self.cursor.as_ptr().sub(1));
// SAFETY: All methods ensure `self.cursor` is always in bounds, is aligned for `T`,
@ -557,13 +564,22 @@ mod tests {
stack.push(40);
assert_len_cap_last!(stack, 4, 4, Some(&40));
assert_eq!(stack.capacity_bytes(), 32);
assert_eq!(stack.pop(), Some(40));
assert_len_cap_last!(stack, 3, 4, Some(&31));
assert_eq!(stack.capacity_bytes(), 32);
stack.push(41);
assert_len_cap_last!(stack, 4, 4, Some(&41));
assert_eq!(stack.capacity_bytes(), 32);
stack.push(50);
assert_len_cap_last!(stack, 5, 8, Some(&50));
assert_eq!(stack.capacity_bytes(), 64);
assert_eq!(stack.pop(), Some(50));
assert_len_cap_last!(stack, 4, 8, Some(&40));
assert_eq!(stack.pop(), Some(40));
assert_len_cap_last!(stack, 4, 8, Some(&41));
assert_eq!(stack.pop(), Some(41));
assert_len_cap_last!(stack, 3, 8, Some(&31));
assert_eq!(stack.pop(), Some(31));
assert_len_cap_last!(stack, 2, 8, Some(&20));