Skip to content

Fix ICE in undocumented_unsafe_blocks #7945

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.

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
Nov 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion clippy_lints/src/undocumented_unsafe_blocks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,8 @@ impl UndocumentedUnsafeBlocks {
let lex_end = (between_span.hi().0 - source_file.start_pos.0) as usize;
let src_str = source_file.src.as_ref()?[lex_start..lex_end].to_string();

let source_start_pos = source_file.start_pos.0 as usize + lex_start;

let mut pos = 0;
let mut comment = false;

Expand All @@ -171,7 +173,7 @@ impl UndocumentedUnsafeBlocks {
if comment {
// Get the line number of the "comment" (really wherever the trailing whitespace ended)
let comment_line_num = source_file
.lookup_file_pos_with_col_display(BytePos((lex_start + pos).try_into().unwrap()))
.lookup_file_pos(BytePos((source_start_pos + pos).try_into().unwrap()))
.0;
// Find the block/local's line number
let block_line_num = tcx.sess.source_map().lookup_char_pos(block_span.lo()).line;
Expand Down
4 changes: 4 additions & 0 deletions tests/ui/crashes/auxiliary/ice-7934-aux.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
fn zero() {
// SAFETY:
unsafe { 0 };
}
7 changes: 7 additions & 0 deletions tests/ui/crashes/ice-7934.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#![warn(clippy::undocumented_unsafe_blocks)]
#![allow(clippy::no_effect)]

#[path = "auxiliary/ice-7934-aux.rs"]
mod zero;

fn main() {}