From 96340e5668dc633730d876fd7610ce3f458b78c6 Mon Sep 17 00:00:00 2001 From: Camille GILLOT Date: Mon, 31 Jan 2022 19:55:34 +0100 Subject: [PATCH 1/2] Ensure that queries only return Copy types. --- src/builder.rs | 2 +- src/context.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/builder.rs b/src/builder.rs index ffb77e16a148..8e4b31642754 100644 --- a/src/builder.rs +++ b/src/builder.rs @@ -354,7 +354,7 @@ impl<'tcx> FnAbiOfHelpers<'tcx> for Builder<'_, '_, 'tcx> { #[inline] fn handle_fn_abi_err( &self, - err: FnAbiError<'tcx>, + err: &'tcx FnAbiError<'tcx>, span: Span, fn_abi_request: FnAbiRequest<'tcx>, ) -> ! { diff --git a/src/context.rs b/src/context.rs index dfcd1b623121..6cf67e9186da 100644 --- a/src/context.rs +++ b/src/context.rs @@ -397,7 +397,7 @@ impl<'gcc, 'tcx> FnAbiOfHelpers<'tcx> for CodegenCx<'gcc, 'tcx> { #[inline] fn handle_fn_abi_err( &self, - err: FnAbiError<'tcx>, + err: &'tcx FnAbiError<'tcx>, span: Span, fn_abi_request: FnAbiRequest<'tcx>, ) -> ! { From 1b2337c19d713ff0e9d0ac614789894bcad6b598 Mon Sep 17 00:00:00 2001 From: Camille GILLOT Date: Tue, 1 Feb 2022 18:44:45 +0100 Subject: [PATCH 2/2] Make FnAbiError Copy. --- src/builder.rs | 2 +- src/context.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/builder.rs b/src/builder.rs index 8e4b31642754..ffb77e16a148 100644 --- a/src/builder.rs +++ b/src/builder.rs @@ -354,7 +354,7 @@ impl<'tcx> FnAbiOfHelpers<'tcx> for Builder<'_, '_, 'tcx> { #[inline] fn handle_fn_abi_err( &self, - err: &'tcx FnAbiError<'tcx>, + err: FnAbiError<'tcx>, span: Span, fn_abi_request: FnAbiRequest<'tcx>, ) -> ! { diff --git a/src/context.rs b/src/context.rs index 6cf67e9186da..dfcd1b623121 100644 --- a/src/context.rs +++ b/src/context.rs @@ -397,7 +397,7 @@ impl<'gcc, 'tcx> FnAbiOfHelpers<'tcx> for CodegenCx<'gcc, 'tcx> { #[inline] fn handle_fn_abi_err( &self, - err: &'tcx FnAbiError<'tcx>, + err: FnAbiError<'tcx>, span: Span, fn_abi_request: FnAbiRequest<'tcx>, ) -> ! {