Skip to content

Commit

Permalink
Revert const_err lint checking of casts
Browse files Browse the repository at this point in the history
Reverts part of #67676
  • Loading branch information
wesleywiser committed Jan 3, 2020
1 parent 0a58f58 commit 8e4886d
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 91 deletions.
70 changes: 7 additions & 63 deletions src/librustc_mir/transform/const_prop.rs
Expand Up @@ -12,10 +12,10 @@ use rustc::mir::visit::{
MutVisitor, MutatingUseContext, NonMutatingUseContext, PlaceContext, Visitor,
};
use rustc::mir::{
read_only, AggregateKind, BasicBlock, BinOp, Body, BodyAndCache, CastKind, ClearCrossCrate,
Constant, Local, LocalDecl, LocalKind, Location, Operand, Place, PlaceBase,
ReadOnlyBodyAndCache, Rvalue, SourceInfo, SourceScope, SourceScopeData, Statement,
StatementKind, Terminator, TerminatorKind, UnOp, RETURN_PLACE,
read_only, AggregateKind, BasicBlock, BinOp, Body, BodyAndCache, ClearCrossCrate, Constant,
Local, LocalDecl, LocalKind, Location, Operand, Place, PlaceBase, ReadOnlyBodyAndCache, Rvalue,
SourceInfo, SourceScope, SourceScopeData, Statement, StatementKind, Terminator, TerminatorKind,
UnOp, RETURN_PLACE,
};
use rustc::ty::layout::{
HasDataLayout, HasTyCtxt, LayoutError, LayoutOf, Size, TargetDataLayout, TyLayout,
Expand All @@ -29,9 +29,9 @@ use syntax::ast::Mutability;

use crate::const_eval::error_to_const_error;
use crate::interpret::{
self, intern_const_alloc_recursive, truncate, AllocId, Allocation, Frame, ImmTy, Immediate,
InterpCx, LocalState, LocalValue, Memory, MemoryKind, OpTy, Operand as InterpOperand, PlaceTy,
Pointer, ScalarMaybeUndef, StackPopCleanup,
self, intern_const_alloc_recursive, AllocId, Allocation, Frame, ImmTy, Immediate, InterpCx,
LocalState, LocalValue, Memory, MemoryKind, OpTy, Operand as InterpOperand, PlaceTy, Pointer,
ScalarMaybeUndef, StackPopCleanup,
};
use crate::rustc::ty::subst::Subst;
use crate::transform::{MirPass, MirSource};
Expand Down Expand Up @@ -539,57 +539,6 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
Some(())
}

fn check_cast(
&mut self,
op: &Operand<'tcx>,
ty: Ty<'tcx>,
source_info: SourceInfo,
place_layout: TyLayout<'tcx>,
) -> Option<()> {
if !ty.is_integral() || !op.ty(&self.local_decls, self.tcx).is_integral() {
return Some(());
}

let value = self.use_ecx(source_info, |this| {
this.ecx.read_immediate(this.ecx.eval_operand(op, None)?)
})?;

// Do not try to read bits for ZSTs. This can occur when casting an enum with one variant
// to an integer. Such enums are represented as ZSTs but still have a discriminant value
// which can be casted.
if value.layout.is_zst() {
return Some(());
}

let value_size = value.layout.size;
let value_bits = value.to_scalar().and_then(|r| r.to_bits(value_size));
if let Ok(value_bits) = value_bits {
let truncated = truncate(value_bits, place_layout.size);
if truncated != value_bits {
let scope = source_info.scope;
let lint_root = match &self.source_scopes[scope].local_data {
ClearCrossCrate::Set(data) => data.lint_root,
ClearCrossCrate::Clear => return None,
};
self.tcx.lint_hir(
::rustc::lint::builtin::CONST_ERR,
lint_root,
source_info.span,
&format!(
"truncating cast: the value {} requires {} bits but the target type is \
only {} bits",
value_bits,
value_size.bits(),
place_layout.size.bits()
),
);
return None;
}
}

Some(())
}

fn const_prop(
&mut self,
rvalue: &Rvalue<'tcx>,
Expand Down Expand Up @@ -651,11 +600,6 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
}
}

Rvalue::Cast(CastKind::Misc, op, ty) => {
trace!("checking Cast(Misc, {:?}, {:?})", op, ty);
self.check_cast(op, ty, source_info, place_layout)?;
}

_ => {}
}

Expand Down
16 changes: 11 additions & 5 deletions src/test/ui/consts/const-prop-overflowing-casts.rs
@@ -1,9 +1,15 @@
// build-fail
// ignore-tidy-linelength
// check-pass

enum Foo {
Bar = -42,
Baz = 42,
}

fn main() {
let _ = 0u8 as u32;
let _ = (1u32 << 31) as u16; //~ ERROR truncating cast: the value 2147483648 requires 32 bits but the target type is only 16 bits
let _ = (1u16 << 15) as u8; //~ ERROR truncating cast: the value 32768 requires 16 bits but the target type is only 8 bits
let _ = (!0u16) as u8; //~ ERROR truncating cast: the value 65535 requires 16 bits but the target type is only 8 bits
let _ = (1u32 << 31) as u16;
let _ = (1u16 << 15) as u8;
let _ = (!0u16) as u8;
let _ = (-1i16) as i8;
let _ = (Foo::Bar) as i8;
}
22 changes: 0 additions & 22 deletions src/test/ui/consts/const-prop-overflowing-casts.stderr

This file was deleted.

1 change: 0 additions & 1 deletion src/test/ui/simd/simd-intrinsic-generic-cast.rs
Expand Up @@ -4,7 +4,6 @@

#![feature(repr_simd, platform_intrinsics, concat_idents, test)]
#![allow(non_camel_case_types)]
#![allow(const_err)] // the test macro casts i32s to i8 and u8 which causes lots of warnings

extern crate test;

Expand Down

0 comments on commit 8e4886d

Please sign in to comment.