Skip to content

Only emit alignment checks if we have a panic_impl #110283

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
Apr 13, 2023
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
7 changes: 7 additions & 0 deletions compiler/rustc_mir_transform/src/check_alignment.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use crate::MirPass;
use rustc_hir::def_id::DefId;
use rustc_hir::lang_items::LangItem;
use rustc_index::vec::IndexVec;
use rustc_middle::mir::*;
use rustc_middle::mir::{
Expand All @@ -17,6 +18,12 @@ impl<'tcx> MirPass<'tcx> for CheckAlignment {
}

fn run_pass(&self, tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) {
// This pass emits new panics. If for whatever reason we do not have a panic
// implementation, running this pass may cause otherwise-valid code to not compile.
if tcx.lang_items().get(LangItem::PanicImpl).is_none() {
return;
}

let basic_blocks = body.basic_blocks.as_mut();
let local_decls = &mut body.local_decls;

Expand Down
17 changes: 17 additions & 0 deletions tests/ui/mir/checks_without_panic_impl.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// Ensures that the alignment check we insert for raw pointer dereferences
// does not prevent crates without a panic_impl from compiling.
// See rust-lang/rust#109996

// build-pass
// compile-flags: -Cdebug-assertions=yes

#![crate_type = "lib"]

#![feature(lang_items)]
#![feature(no_core)]
#![no_core]

#[lang = "sized"]
trait Foo {}

pub unsafe fn foo(x: *const i32) -> &'static i32 { unsafe { &*x } }