Skip to content

Commit 59bd90e

Browse files
committed
Auto merge of #158891 - jhpratt:rollup-ziqyJdz, r=jhpratt
Rollup of 13 pull requests Successful merges: - rust-lang/rust#158478 (Use correct typing mode in mir building for the next solver) - rust-lang/rust#158796 (Distinguish null reference production from null pointer dereference in UB checks) - rust-lang/rust#158821 (add regression test for late-bound type method probe ICE) - rust-lang/rust#158245 (Update the rustc_perf submodule) - rust-lang/rust#158346 (Prevent rustdoc auto-trait ICEs with `-Znext-solver=globally`) - rust-lang/rust#158536 (Instatiate binder instead of skipping when suggesting function arg error) - rust-lang/rust#158553 (Avoid infinite recursion when trying to build valtrees for self-referential consts) - rust-lang/rust#158679 (Document blocking guarantees for `std::sync`) - rust-lang/rust#158826 (Reorganize `tests/ui/issues` [19/N]) - rust-lang/rust#158860 (Delete `impl_def_id` field from `ImplHeader`) - rust-lang/rust#158867 (rewrite `Align::max_for_target` in a more obvious way) - rust-lang/rust#158878 (borrowck: Inline `free_region_constraint_info()` to simplify the code) - rust-lang/rust#158881 (Update mdbook to 0.5.4)
2 parents c311018 + baa392a commit 59bd90e

1 file changed

Lines changed: 11 additions & 0 deletions

File tree

src/base.rs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,17 @@ fn codegen_fn_body(fx: &mut FunctionCx<'_, '_, '_>, start_block: Block) {
421421
source_info.span,
422422
)
423423
}
424+
AssertKind::NullReferenceConstructed => {
425+
let location = fx.get_caller_location(source_info).load_scalar(fx);
426+
427+
codegen_panic_inner(
428+
fx,
429+
rustc_hir::LangItem::PanicNullReferenceConstructed,
430+
&[location],
431+
*unwind,
432+
source_info.span,
433+
)
434+
}
424435
AssertKind::InvalidEnumConstruction(source) => {
425436
let source = codegen_operand(fx, source).load_scalar(fx);
426437
let location = fx.get_caller_location(source_info).load_scalar(fx);

0 commit comments

Comments
 (0)