language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 15:15:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix mir CString lowering not respecting the extra 0 byte for length calc

Browse source
This commit is contained in:
Lukas Wirth 2023-05-18 11:29:19 +02:00
parent 4b577e2bc8
commit eab295cc73
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/hir-ty/src/mir/lower.rs
View file

@ -1121,11 +1121,13 @@ impl<'ctx> MirLowerCtx<'ctx> {
} }
hir_def::hir::Literal::CString(b) => { hir_def::hir::Literal::CString(b) => {
let b = b.as_bytes(); let b = b.as_bytes();
let bytes = b.iter().copied().chain(iter::once(0)).collect::<Vec<_>>();
let mut data = Vec::with_capacity(mem::size_of::<usize>() * 2); let mut data = Vec::with_capacity(mem::size_of::<usize>() * 2);
data.extend(0usize.to_le_bytes()); data.extend(0usize.to_le_bytes());
data.extend(b.len().to_le_bytes()); data.extend(bytes.len().to_le_bytes());
let mut mm = MemoryMap::default(); let mut mm = MemoryMap::default();
mm.insert(0, b.iter().copied().chain(iter::once(0)).collect::<Vec<_>>()); mm.insert(0, bytes);
return Ok(Operand::from_concrete_const(data, mm, ty)); return Ok(Operand::from_concrete_const(data, mm, ty));
} }
hir_def::hir::Literal::ByteString(b) => { hir_def::hir::Literal::ByteString(b) => {