itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 11:20:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

add assert to check ast_index smaller than INNER_ATTR_SET_BIT

Browse Source 
Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com>
This commit is contained in:
Hayashi Mikihiro 2025-05-08 23:37:47 +09:00
parent 0235ff883f
commit 7c7d440188
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
crates/hir-expand/src/attrs.rs
View File

@ -123,15 +123,15 @@ impl RawAttrs {
(None, entries @ Some(_)) => Self { entries },
(Some(entries), None) => Self { entries: Some(entries.clone()) },
(Some(a), Some(b)) => {
let last_ast_index = a.slice.last().map_or(0, |it| it.id.ast_index() + 1) as u32;
let last_ast_index = a.slice.last().map_or(0, |it| it.id.ast_index() + 1);
let items = a
.slice
.iter()
.cloned()
.chain(b.slice.iter().map(|it| {
let mut it = it.clone();
let id = it.id.ast_index() as u32 + last_ast_index;
it.id = AttrId::new(id as usize, it.id.is_inner_attr());
let id = it.id.ast_index() + last_ast_index;
it.id = AttrId::new(id, it.id.is_inner_attr());
it
}))
.collect::<Vec<_>>();
@ -175,24 +175,20 @@ pub struct AttrId {
// FIXME: This only handles a single level of cfg_attr nesting
// that is `#[cfg_attr(all(), cfg_attr(all(), cfg(any())))]` breaks again
impl AttrId {
const INNER_ATTR_SET_BIT: usize = 1 << 31;
const INNER_ATTR_SET_BIT: u32 = 1 << 31;
pub fn new(id: usize, is_inner: bool) -> Self {
Self {
id: if is_inner {
id | Self::INNER_ATTR_SET_BIT
} else {
id & !Self::INNER_ATTR_SET_BIT
} as u32,
}
assert!(id <= !Self::INNER_ATTR_SET_BIT as usize);
let id = id as u32;
Self { id: if is_inner { id | Self::INNER_ATTR_SET_BIT } else { id } }
}
pub fn ast_index(&self) -> usize {
self.id as usize & !Self::INNER_ATTR_SET_BIT
(self.id & !Self::INNER_ATTR_SET_BIT) as usize
}
pub fn is_inner_attr(&self) -> bool {
(self.id as usize) & Self::INNER_ATTR_SET_BIT != 0
self.id & Self::INNER_ATTR_SET_BIT != 0
}
}