bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #94554 - Urgau:stmt-node-id-ice, r=petrochenkov

Browse source 
Fix invalid lint_node_id being put on a removed stmt

This pull-request remove a invalid `assign_id!` being put on an stmt node.

The problem is that this node is being removed away by a cfg making it unreachable when triggering a buffered lint.
The comment in the other match arm already tell to not assign a id because it could have a `#[cfg()]` so this is just respecting the comment.

Fixes https://github.com/rust-lang/rust/issues/94523
r? ```````@petrochenkov```````
This commit is contained in:
Matthias Krüger 2022-03-03 20:01:48 +01:00 • committed by GitHub
commit 26cbf9158d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_expand/src/expand.rs
View file

@ -1841,7 +1841,7 @@ impl<'a, 'b> MutVisitor for InvocationCollector<'a, 'b> {
self.flat_map_node(node)
}
fn flat_map_stmt(&mut self, mut node: ast::Stmt) -> SmallVec<[ast::Stmt; 1]> {
fn flat_map_stmt(&mut self, node: ast::Stmt) -> SmallVec<[ast::Stmt; 1]> {
// FIXME: invocations in semicolon-less expressions positions are expanded as expressions,
// changing that requires some compatibility measures.
if node.is_expr() {
@ -1863,7 +1863,7 @@ impl<'a, 'b> MutVisitor for InvocationCollector<'a, 'b> {
self.cx.current_expansion.is_trailing_mac = false;
res
}
_ => assign_id!(self, &mut node.id, || noop_flat_map_stmt(node, self)),
_ => noop_flat_map_stmt(node, self),
};
}