index: add method for checking range on DenseBitSet #141871

nia-e · 2025-06-01T20:43:02Z

Micro-optimisation that Miri benefits from with the new isolated allocator for native-libs mode. Also possibly just a useful method to have on DenseBitSet

rustbot · 2025-06-01T20:43:06Z

r? @eholk

rustbot has assigned @eholk.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot · 2025-06-01T20:43:08Z

The Miri subtree was changed

cc @rust-lang/miri

compiler/rustc_index/src/bit_set.rs

eholk

Could you also add a unit test for contains_any in compiler/rustc_index/src/bit_set/tests.rs?

eholk · 2025-06-03T18:46:50Z

compiler/rustc_index/src/bit_set.rs

+        let (start_word_index, start_mask) = word_index_and_mask(start);
+        let (end_word_index, end_mask) = word_index_and_mask(end);
+
+        if self.words[start_word_index] & (!start_mask | !(start_mask - 1)) != 0 {


It seems like !start_mask | !(start_mask - 1) is always all ones. For example, if start_mask is 0b001000, then we have:

!(0b001000) | !(0b001000 - 1)

0b110111 | !(0b000111)

0b110111 | 0b111000

0b111111

I think maybe you just want !(start_mask - 1), but let me know if I misunderstood.

Ah ok you're right, I tried to make it symmetric with the end_mask bit but I missed that. Thanks!

nia-e · 2025-06-03T21:01:37Z

@rustbot ready

eholk · 2025-06-03T21:24:34Z

@bors r+

bors · 2025-06-03T21:24:37Z

📌 Commit 21f842d has been approved by eholk

It is now in the queue for this repository.

nia-e · 2025-06-03T22:14:43Z

Gah, I think I know what's wrong. Should have let the tests run to the end locally, I think I fixed it and I'll push if so

nia-e · 2025-06-03T22:48:12Z

Should be good? I'll wait for the CI before re-requesting approval just to be safe

nia-e · 2025-06-03T22:48:49Z

@eholk you can r- this for now so it doesn't sit in the queue

eholk · 2025-06-03T22:50:08Z

@bors r-

eholk · 2025-06-03T22:50:44Z

@eholk you can r- this for now so it doesn't sit in the queue

Sure thing. Feel free to r=me once things are passing again, or ping me and I'll approve it again.

nia-e · 2025-06-04T04:48:09Z

@bors r=eholk

bors · 2025-06-04T04:48:11Z

@nia-e: 🔑 Insufficient privileges: Not in reviewers

nia-e · 2025-06-04T04:48:34Z

😔

@eholk

eholk · 2025-06-04T05:03:49Z

@bors r+ rollup

bors · 2025-06-04T05:03:52Z

📌 Commit a0c19ee has been approved by eholk

It is now in the queue for this repository.

Rollup of 8 pull requests Successful merges: - #136687 (Improve the documentation of `Display` and `FromStr`, and their interactions) - #137306 (Remove `i128` and `u128` from `improper_ctypes_definitions`) - #138699 (build dist for x86_64-pc-solaris and sparcv9-sun-solaris) - #141250 (add s390x z17 target features) - #141467 (make `OsString::new` and `PathBuf::new` unstably const) - #141871 (index: add method for checking range on DenseBitSet) - #141888 (Use non-2015 edition paths in tests that do not test for their resolution) - #142000 (bootstrap: don't symlink source dir into stage0 sysroot) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #141871 - nia-e:fix-bitset, r=eholk index: add method for checking range on DenseBitSet Micro-optimisation that Miri benefits from with the new isolated allocator for native-libs mode. Also possibly just a useful method to have on `DenseBitSet`

Rollup of 8 pull requests Successful merges: - rust-lang/rust#136687 (Improve the documentation of `Display` and `FromStr`, and their interactions) - rust-lang/rust#137306 (Remove `i128` and `u128` from `improper_ctypes_definitions`) - rust-lang/rust#138699 (build dist for x86_64-pc-solaris and sparcv9-sun-solaris) - rust-lang/rust#141250 (add s390x z17 target features) - rust-lang/rust#141467 (make `OsString::new` and `PathBuf::new` unstably const) - rust-lang/rust#141871 (index: add method for checking range on DenseBitSet) - rust-lang/rust#141888 (Use non-2015 edition paths in tests that do not test for their resolution) - rust-lang/rust#142000 (bootstrap: don't symlink source dir into stage0 sysroot) r? `@ghost` `@rustbot` modify labels: rollup

rustbot assigned eholk Jun 1, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jun 1, 2025

aDotInTheVoid reviewed Jun 1, 2025

View reviewed changes

compiler/rustc_index/src/bit_set.rs Outdated Show resolved Hide resolved

nia-e force-pushed the fix-bitset branch from 4c109f7 to b9ef914 Compare June 2, 2025 01:21

This comment has been minimized.

# to view

nia-e force-pushed the fix-bitset branch 2 times, most recently from 001744c to 4164a82 Compare June 2, 2025 02:33

eholk requested changes Jun 3, 2025

View reviewed changes

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 3, 2025

nia-e force-pushed the fix-bitset branch from 4164a82 to b986746 Compare June 3, 2025 20:59

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 3, 2025

This comment has been minimized.

# to view

nia-e force-pushed the fix-bitset branch from b986746 to 21f842d Compare June 3, 2025 21:18

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 3, 2025

This comment has been minimized.

# to view

index: add method for checking range on DenseBitSet

a0c19ee

nia-e force-pushed the fix-bitset branch from 21f842d to a0c19ee Compare June 3, 2025 22:47

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 3, 2025

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 4, 2025

matthiaskrgr mentioned this pull request Jun 4, 2025

Rollup of 8 pull requests #142003

Merged

bors merged commit e63e53a into rust-lang:master Jun 4, 2025
10 checks passed

rustbot added this to the 1.89.0 milestone Jun 4, 2025

nia-e deleted the fix-bitset branch June 4, 2025 14:57

index: add method for checking range on DenseBitSet #141871

index: add method for checking range on DenseBitSet #141871

Uh oh!

Conversation

nia-e commented Jun 1, 2025

Uh oh!

rustbot commented Jun 1, 2025

Uh oh!

rustbot commented Jun 1, 2025

Uh oh!

Uh oh!

This comment has been minimized.

eholk left a comment

Choose a reason for hiding this comment

Uh oh!

eholk Jun 3, 2025

Choose a reason for hiding this comment

Uh oh!

nia-e Jun 3, 2025

Choose a reason for hiding this comment

Uh oh!

nia-e commented Jun 3, 2025

Uh oh!

This comment has been minimized.

eholk commented Jun 3, 2025

Uh oh!

bors commented Jun 3, 2025

Uh oh!

This comment has been minimized.

nia-e commented Jun 3, 2025

Uh oh!

nia-e commented Jun 3, 2025

Uh oh!

nia-e commented Jun 3, 2025

Uh oh!

eholk commented Jun 3, 2025

Uh oh!

eholk commented Jun 3, 2025

Uh oh!

nia-e commented Jun 4, 2025

Uh oh!

bors commented Jun 4, 2025

Uh oh!

nia-e commented Jun 4, 2025

Uh oh!

eholk commented Jun 4, 2025

Uh oh!

bors commented Jun 4, 2025

Uh oh!

Uh oh!

Uh oh!