bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

review comments

Browse source
This commit is contained in:
Vishnunarayan K I 2020-11-10 14:59:44 +05:30
parent 5029a19313
commit 8119c4beee
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_mir/src/const_eval/eval_queries.rs
View file

@ -282,9 +282,8 @@ pub fn eval_to_allocation_raw_provider<'tcx>(
);
return Err(ErrorHandled::Reported(ErrorReported {}));
}
let qualif = tcx.mir_const_qualif_opt_const_arg(def);
if qualif.error_occured {
return Err(ErrorHandled::Reported(ErrorReported {}));
if let Some(error_reported) = tcx.mir_const_qualif_opt_const_arg(def).error_occured {
return Err(ErrorHandled::Reported(error_reported));
}
}

3
compiler/rustc_mir/src/transform/check_consts/qualifs.rs
View file

@ -2,6 +2,7 @@
//!
//! See the `Qualif` trait for more info.
use rustc_errors::ErrorReported;
use rustc_middle::mir::*;
use rustc_middle::ty::{self, subst::SubstsRef, AdtDef, Ty};
use rustc_span::DUMMY_SP;
@ -12,7 +13,7 @@ use super::ConstCx;
pub fn in_any_value_of_ty(
cx: &ConstCx<'_, 'tcx>,
ty: Ty<'tcx>,
error_occured: bool,
error_occured: Option<ErrorReported>,
) -> ConstQualifs {
ConstQualifs {
has_mut_interior: HasMutInterior::in_any_value_of_ty(cx, ty),

12
compiler/rustc_mir/src/transform/check_consts/validation.rs
View file

@ -1,6 +1,6 @@
//! The `Visitor` responsible for actually checking a `mir::Body` for invalid operations.
use rustc_errors::{struct_span_err, Applicability, Diagnostic};
use rustc_errors::{struct_span_err, Applicability, Diagnostic, ErrorReported};
use rustc_hir::def_id::DefId;
use rustc_hir::{self as hir, HirId, LangItem};
use rustc_infer::infer::TyCtxtInferExt;
@ -126,7 +126,7 @@ impl Qualifs<'mir, 'tcx> {
fn in_return_place(
&mut self,
ccx: &'mir ConstCx<'mir, 'tcx>,
error_occured: bool,
error_occured: Option<ErrorReported>,
) -> ConstQualifs {
// Find the `Return` terminator if one exists.
//
@ -186,7 +186,7 @@ pub struct Validator<'mir, 'tcx> {
/// The span of the current statement.
span: Span,
error_emitted: bool,
error_emitted: Option<ErrorReported>,
secondary_errors: Vec<Diagnostic>,
}
@ -204,7 +204,7 @@ impl Validator<'mir, 'tcx> {
span: ccx.body.span,
ccx,
qualifs: Default::default(),
error_emitted: false,
error_emitted: None,
secondary_errors: Vec::new(),
}
}
@ -271,7 +271,7 @@ impl Validator<'mir, 'tcx> {
// If we got through const-checking without emitting any "primary" errors, emit any
// "secondary" errors if they occurred.
let secondary_errors = mem::take(&mut self.secondary_errors);
if !self.error_emitted {
if self.error_emitted.is_none() {
for error in secondary_errors {
self.tcx.sess.diagnostic().emit_diagnostic(&error);
}
@ -323,7 +323,7 @@ impl Validator<'mir, 'tcx> {
match op.importance() {
ops::DiagnosticImportance::Primary => {
self.error_emitted = true;
self.error_emitted = Some(ErrorReported);
err.emit();
}