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

Simplify a ScalarPair creation

Browse Source
This commit is contained in:
Oliver Schneider 2018-05-24 10:50:05 +02:00
parent ca8c27e1c1
commit 1a2964a541
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/librustc_mir/hair/pattern/mod.rs
View File

@ -1134,13 +1134,8 @@ fn lit_to_const<'a, 'tcx>(lit: &'tcx ast::LitKind,
LitKind::Str(ref s, _) => {
let s = s.as_str();
let id = tcx.allocate_bytes(s.as_bytes());
ConstValue::ScalarPair(
Scalar::Ptr(id.into()),
Scalar::Bits {
bits: s.len() as u128,
defined: tcx.data_layout.pointer_size.bits() as u8,
},
)
let value = Scalar::Ptr(id.into()).to_value_with_len(s.len() as u64, tcx);
ConstValue::from_byval_value(value)
},
LitKind::ByteStr(ref data) => {
let id = tcx.allocate_bytes(data);