bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Port LinkageConstOrMutType error

Browse source
This commit is contained in:
SLASHLogin 2022-08-26 10:40:48 +02:00
parent 5d79d3c4bb
commit 60ee496c74
3 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/rustc_codegen_llvm/src/consts.rs
View file

@ -1,7 +1,7 @@
use crate::base; use crate::base;
use crate::common::{self, CodegenCx}; use crate::common::{self, CodegenCx};
use crate::debuginfo; use crate::debuginfo;
use crate::errors::InvalidMinimumAlignment; use crate::errors::{InvalidMinimumAlignment, LinkageConstOrMutType};
use crate::llvm::{self, True}; use crate::llvm::{self, True};
use crate::llvm_util; use crate::llvm_util;
use crate::type_::Type; use crate::type_::Type;
@ -147,9 +147,7 @@ fn set_global_alignment<'ll>(cx: &CodegenCx<'ll, '_>, gv: &'ll Value, mut align:
match Align::from_bits(min) { match Align::from_bits(min) {
Ok(min) => align = align.max(min), Ok(min) => align = align.max(min),
Err(err) => { Err(err) => {
cx.sess().emit_err(InvalidMinimumAlignment { cx.sess().emit_err(InvalidMinimumAlignment { err });
err,
});
} }
} }
} }
@ -177,10 +175,7 @@ fn check_and_apply_linkage<'ll, 'tcx>(
let llty2 = if let ty::RawPtr(ref mt) = ty.kind() { let llty2 = if let ty::RawPtr(ref mt) = ty.kind() {
cx.layout_of(mt.ty).llvm_type(cx) cx.layout_of(mt.ty).llvm_type(cx)
} else { } else {
cx.sess().span_fatal( cx.sess().emit_fatal(LinkageConstOrMutType { span: cx.tcx.def_span(def_id) })
cx.tcx.def_span(def_id),
"must have type `*const T` or `*mut T` due to `#[linkage]` attribute",
)
}; };
unsafe { unsafe {
// Declare a symbol `foo` with the desired linkage. // Declare a symbol `foo` with the desired linkage.

9
compiler/rustc_codegen_llvm/src/errors.rs
View file

@ -71,5 +71,12 @@ pub(crate) struct LayoutSizeOverflow {
#[derive(SessionDiagnostic)] #[derive(SessionDiagnostic)]
#[diag(codegen_llvm::invalid_minimum_alignment)] #[diag(codegen_llvm::invalid_minimum_alignment)]
pub(crate) struct InvalidMinimumAlignment { pub(crate) struct InvalidMinimumAlignment {
pub err: String pub err: String,
}
#[derive(SessionDiagnostic)]
#[diag(codegen_llvm::linkage_const_or_mut_type)]
pub(crate) struct LinkageConstOrMutType {
#[primary_span]
pub span: Span,
} }

3
compiler/rustc_error_messages/locales/en-US/codegen_llvm.ftl
View file

@ -30,3 +30,6 @@ codegen_llvm_layout_size_overflow =
codegen_llvm_invalid_minimum_alignment = codegen_llvm_invalid_minimum_alignment =
invalid minimum global alignment: {$err} invalid minimum global alignment: {$err}
codegen_llvm_linkage_const_or_mut_type =
must have type `*const T` or `*mut T` due to `#[linkage]` attribute