Skip to content

Commit 4a660ae

Browse files
committed
Auto merge of #149450 - Zalathar:rollup-xxu162q, r=Zalathar
Rollup of 3 pull requests Successful merges: - rust-lang/rust#144000 (Add `DefId::parent()` accessor for `rustc_public`) - rust-lang/rust#149409 (Test the coexistence of 'stack-protector' and 'safe-stack') - rust-lang/rust#149449 (Remove an unnecessary `unwrap` in `rustc_codegen_gcc`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 2a7d69e + 2597bd6 commit 4a660ae

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/builder.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -503,9 +503,9 @@ fn set_rvalue_location<'a, 'gcc, 'tcx>(
503503
bx: &mut Builder<'a, 'gcc, 'tcx>,
504504
rvalue: RValue<'gcc>,
505505
) -> RValue<'gcc> {
506-
if bx.location.is_some() {
506+
if let Some(location) = bx.location {
507507
#[cfg(feature = "master")]
508-
rvalue.set_location(bx.location.unwrap());
508+
rvalue.set_location(location);
509509
}
510510
rvalue
511511
}

0 commit comments

Comments
 (0)