1
Fork 0

Start adding enum errors for deserialize_rlink

This commit is contained in:
Adrian Tombu 2022-08-24 19:15:44 +02:00
parent 1c575c5fe0
commit 3f883b850d
No known key found for this signature in database
GPG key ID: 9CD8E979D3A943FE
7 changed files with 76 additions and 10 deletions

View file

@ -21,6 +21,7 @@ extern crate tracing;
#[macro_use]
extern crate rustc_middle;
use crate::session_diagnostic::{DeserializeRlinkError, DeserializeRlinkErrorSub};
use rustc_ast as ast;
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
use rustc_data_structures::sync::Lrc;
@ -49,6 +50,7 @@ pub mod glue;
pub mod meth;
pub mod mir;
pub mod mono_item;
pub mod session_diagnostic;
pub mod target_features;
pub mod traits;
@ -212,30 +214,40 @@ impl CodegenResults {
encoder.finish()
}
pub fn deserialize_rlink(data: Vec<u8>) -> Result<Self, String> {
pub fn deserialize_rlink(data: Vec<u8>) -> Result<Self, DeserializeRlinkError> {
// The Decodable machinery is not used here because it panics if the input data is invalid
// and because its internal representation may change.
if !data.starts_with(RLINK_MAGIC) {
return Err("The input does not look like a .rlink file".to_string());
return Err(DeserializeRlinkError { sub: DeserializeRlinkErrorSub::WrongFileType });
}
let data = &data[RLINK_MAGIC.len()..];
if data.len() < 4 {
return Err("The input does not contain version number".to_string());
return Err(DeserializeRlinkError {
sub: DeserializeRlinkErrorSub::EmptyVersionNumber,
});
}
let mut version_array: [u8; 4] = Default::default();
version_array.copy_from_slice(&data[..4]);
if u32::from_be_bytes(version_array) != RLINK_VERSION {
return Err(".rlink file was produced with encoding version {version_array}, but the current version is {RLINK_VERSION}".to_string());
return Err(DeserializeRlinkError {
sub: DeserializeRlinkErrorSub::EncodingVersionMismatch {
version_array: String::from_utf8_lossy(&version_array).to_string(),
rlink_version: RLINK_VERSION.to_string(),
},
});
}
let mut decoder = MemDecoder::new(&data[4..], 0);
let rustc_version = decoder.read_str();
let current_version = RUSTC_VERSION.unwrap();
if rustc_version != current_version {
return Err(format!(
".rlink file was produced by rustc version {rustc_version}, but the current version is {current_version}."
));
return Err(DeserializeRlinkError {
sub: DeserializeRlinkErrorSub::RustcVersionMismatch {
rustc_version: rustc_version.to_string(),
current_version: current_version.to_string(),
},
});
}
let codegen_results = CodegenResults::decode(&mut decoder);

View file

@ -0,0 +1,42 @@
use rustc_errors::{fluent, DiagnosticArgValue, IntoDiagnosticArg};
use rustc_macros::{SessionDiagnostic, SessionSubdiagnostic};
use std::borrow::Cow;
#[derive(SessionDiagnostic)]
#[diag(codegen_ssa::error)]
pub struct DeserializeRlinkError {
#[subdiagnostic]
pub sub: DeserializeRlinkErrorSub,
}
#[derive(SessionSubdiagnostic)]
pub enum DeserializeRlinkErrorSub {
#[note(codegen_ssa::wrong_file_type)]
WrongFileType,
#[note(codegen_ssa::empty_version_number)]
EmptyVersionNumber,
#[note(codegen_ssa::encoding_version_mismatch)]
EncodingVersionMismatch { version_array: String, rlink_version: String },
#[note(codegen_ssa::rustc_version_mismatch)]
RustcVersionMismatch { rustc_version: String, current_version: String },
}
impl IntoDiagnosticArg for DeserializeRlinkErrorSub {
fn into_diagnostic_arg(self) -> DiagnosticArgValue<'static> {
DiagnosticArgValue::Str(Cow::Borrowed(match self {
DeserializeRlinkErrorSub::WrongFileType => fluent::codegen_ssa::wrong_file_type,
DeserializeRlinkErrorSub::EmptyVersionNumber => {
fluent::codegen_ssa::empty_version_number
}
DeserializeRlinkErrorSub::EncodingVersionMismatch { version_array, rlink_version } => {
fluent::codegen_ssa::encoding_version_mismatch
}
DeserializeRlinkErrorSub::RustcVersionMismatch { rustc_version, current_version } => {
fluent::codegen_ssa::rustc_version_mismatch
}
}))
}
}

View file

@ -590,8 +590,8 @@ pub fn try_process_rlink(sess: &Session, compiler: &interface::Compiler) -> Comp
});
let codegen_results = match CodegenResults::deserialize_rlink(rlink_data) {
Ok(codegen) => codegen,
Err(error_message) => {
sess.emit_fatal(RlinkUnableToDeserialize { error_message });
Err(err) => {
sess.emit_fatal(RlinkUnableToDeserialize { err });
}
};
let result = compiler.codegen_backend().link(sess, codegen_results, &outputs);

View file

@ -1,3 +1,4 @@
use rustc_codegen_ssa::session_diagnostic::DeserializeRlinkError;
use rustc_macros::SessionDiagnostic;
#[derive(SessionDiagnostic)]
@ -9,7 +10,7 @@ pub(crate) struct RlinkUnableToRead {
#[derive(SessionDiagnostic)]
#[diag(driver::rlink_unable_to_deserialize)]
pub(crate) struct RlinkUnableToDeserialize {
pub error_message: String,
pub err: DeserializeRlinkError,
}
#[derive(SessionDiagnostic)]

View file

@ -0,0 +1,9 @@
codegen_ssa_error = Error while deserializing rlink file
codegen_ssa_wrong_file_type = The input does not look like a .rlink file
codegen_ssa_empty_version_number = The input does not contain version number
codegen_ssa_encoding_version_mismatch = .rlink file was produced with encoding version `{$version_array}`, but the current version is `{$rlink_version}`
codegen_ssa_rustc_version_mismatch = .rlink file was produced by rustc version `{$rustc_version}`, but the current version is `{$current_version}`

View file

@ -35,6 +35,7 @@ fluent_messages! {
ast_passes => "../locales/en-US/ast_passes.ftl",
borrowck => "../locales/en-US/borrowck.ftl",
builtin_macros => "../locales/en-US/builtin_macros.ftl",
codegen_ssa => "../locales/en-US/codegen_ssa.ftl",
const_eval => "../locales/en-US/const_eval.ftl",
driver => "../locales/en-US/driver.ftl",
expand => "../locales/en-US/expand.ftl",

View file

@ -163,6 +163,7 @@ decl_derive!(
decl_derive!(
[SessionSubdiagnostic, attributes(
// struct/variant attributes
diag,
label,
help,
note,