bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir-ty/src/mir/lower.rs')
-rw-r--r--crates/hir-ty/src/mir/lower.rs15
1 files changed, 13 insertions, 2 deletions
diff --git a/crates/hir-ty/src/mir/lower.rs b/crates/hir-ty/src/mir/lower.rs
index 6f57cf4df3..4bf8070fa4 100644
--- a/crates/hir-ty/src/mir/lower.rs
+++ b/crates/hir-ty/src/mir/lower.rs
@@ -1133,15 +1133,26 @@ impl<'ctx> MirLowerCtx<'ctx> {
let bytes = match l {
hir_def::hir::Literal::String(b) => {
let b = b.as_bytes();
- let mut data = vec![];
+ let mut data = Vec::with_capacity(mem::size_of::<usize>() * 2);
data.extend(0usize.to_le_bytes());
data.extend(b.len().to_le_bytes());
let mut mm = MemoryMap::default();
mm.insert(0, b.to_vec());
return Ok(Operand::from_concrete_const(data, mm, ty));
}
+ hir_def::hir::Literal::CString(b) => {
+ 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);
+ data.extend(0usize.to_le_bytes());
+ data.extend(bytes.len().to_le_bytes());
+ let mut mm = MemoryMap::default();
+ mm.insert(0, bytes);
+ return Ok(Operand::from_concrete_const(data, mm, ty));
+ }
hir_def::hir::Literal::ByteString(b) => {
- let mut data = vec![];
+ let mut data = Vec::with_capacity(mem::size_of::<usize>() * 2);
data.extend(0usize.to_le_bytes());
data.extend(b.len().to_le_bytes());
let mut mm = MemoryMap::default();