OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mir: Unsize ConstVal::ByteStr before comparing &[u8] against it.

Browse Source
This commit is contained in:
Eduard Burtescu 2016-03-08 14:17:35 +02:00
parent ccc5e0732a
commit 9cc5ee359a
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/librustc/middle/ty/sty.rs
View File

@ -948,7 +948,7 @@ impl<'tcx> TyS<'tcx> {
}
}
fn is_slice(&self) -> bool {
pub fn is_slice(&self) -> bool {
match self.sty {
TyRawPtr(mt) | TyRef(_, mt) => match mt.ty.sty {
TySlice(_) | TyStr => true,

25
src/librustc_mir/build/matches/test.rs
View File

@ -175,9 +175,28 @@ impl<'a,'tcx> Builder<'a,'tcx> {
}
TestKind::Eq { ref value, ty } => {
let expect = self.literal_operand(test.span, ty.clone(), Literal::Value {
value: value.clone()
});
// If we're matching against &[u8] with b"...", we need to insert
// an unsizing coercion, as the byte string has type &[u8; N].
let expect = match *value {
ConstVal::ByteStr(ref bytes) if ty.is_slice() => {
let tcx = self.hir.tcx();
let array_ty = tcx.mk_array(tcx.types.u8, bytes.len());
let ref_ty = tcx.mk_imm_ref(tcx.mk_region(ty::ReStatic), array_ty);
let array = self.literal_operand(test.span, ref_ty, Literal::Value {
value: value.clone()
});
let sliced = self.temp(ty);
self.cfg.push_assign(block, test.span, &sliced,
Rvalue::Cast(CastKind::Unsize, array, ty));
Operand::Consume(sliced)
}
_ => {
self.literal_operand(test.span, ty, Literal::Value {
value: value.clone()
})
}
};
let val = Operand::Consume(lvalue.clone());
let fail = self.cfg.start_new_block();
let block = self.compare(block, fail, test.span, BinOp::Eq, expect, val.clone());