Skip to content
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
9 changes: 6 additions & 3 deletions compiler/rustc_mir_build/src/build/expr/into.rs
Original file line number Diff line number Diff line change
Expand Up @@ -449,8 +449,11 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
})
.collect();

let destination = this.cfg.start_new_block();
if !options.contains(InlineAsmOptions::NORETURN) {
this.cfg.push_assign_unit(block, source_info, destination, this.tcx);
}

let destination_block = this.cfg.start_new_block();
this.cfg.terminate(
block,
source_info,
Expand All @@ -462,11 +465,11 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
destination: if options.contains(InlineAsmOptions::NORETURN) {
None
} else {
Some(destination)
Some(destination_block)
},
},
);
destination.unit()
destination_block.unit()
}

// These cases don't actually need a destination
Expand Down
14 changes: 14 additions & 0 deletions src/test/ui/asm/issue-89305.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// Regression test for #89305, where a variable was erroneously reported
// as both unused and possibly-uninitialized.

// check-pass

#![feature(asm)]
#![warn(unused)]

fn main() {
unsafe {
let x: () = asm!("nop");
//~^ WARNING: unused variable: `x`
}
}
15 changes: 15 additions & 0 deletions src/test/ui/asm/issue-89305.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
warning: unused variable: `x`
--> $DIR/issue-89305.rs:11:13
|
LL | let x: () = asm!("nop");
| ^ help: if this is intentional, prefix it with an underscore: `_x`
|
note: the lint level is defined here
--> $DIR/issue-89305.rs:7:9
|
LL | #![warn(unused)]
| ^^^^^^
= note: `#[warn(unused_variables)]` implied by `#[warn(unused)]`

warning: 1 warning emitted