Skip to content

Use regular Vec in BitSet. #147644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 16, 2025
+5 −6
Merged

Use regular Vec in BitSet. #147644

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions compiler/rustc_index/src/bit_set.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ use std::{fmt, iter, slice};
use Chunk::*;
#[cfg(feature = "nightly")]
use rustc_macros::{Decodable_NoContext, Encodable_NoContext};
use smallvec::{SmallVec, smallvec};

use crate::{Idx, IndexVec};

Expand Down Expand Up @@ -118,7 +117,7 @@ macro_rules! bit_relations_inherent_impls {
#[derive(Eq, PartialEq, Hash)]
pub struct DenseBitSet<T> {
domain_size: usize,
words: SmallVec<[Word; 2]>,
words: Vec<Word>,
marker: PhantomData<T>,
}

Expand All @@ -134,15 +133,15 @@ impl<T: Idx> DenseBitSet<T> {
#[inline]
pub fn new_empty(domain_size: usize) -> DenseBitSet<T> {
let num_words = num_words(domain_size);
DenseBitSet { domain_size, words: smallvec![0; num_words], marker: PhantomData }
DenseBitSet { domain_size, words: vec![0; num_words], marker: PhantomData }
}

/// Creates a new, filled bitset with a given `domain_size`.
#[inline]
pub fn new_filled(domain_size: usize) -> DenseBitSet<T> {
let num_words = num_words(domain_size);
let mut result =
DenseBitSet { domain_size, words: smallvec![!0; num_words], marker: PhantomData };
DenseBitSet { domain_size, words: vec![!0; num_words], marker: PhantomData };
result.clear_excess_bits();
result
}
Expand Down Expand Up @@ -1442,7 +1441,7 @@ impl<T: Idx> From<DenseBitSet<T>> for GrowableBitSet<T> {
pub struct BitMatrix<R: Idx, C: Idx> {
num_rows: usize,
num_columns: usize,
words: SmallVec<[Word; 2]>,
words: Vec<Word>,
marker: PhantomData<(R, C)>,
}

Expand All @@ -1455,7 +1454,7 @@ impl<R: Idx, C: Idx> BitMatrix<R, C> {
BitMatrix {
num_rows,
num_columns,
words: smallvec![0; num_rows * words_per_row],
words: vec![0; num_rows * words_per_row],
marker: PhantomData,
}
}
Expand Down
Loading