Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir-ty/src/mir/eval.rs')
| -rw-r--r-- | crates/hir-ty/src/mir/eval.rs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/crates/hir-ty/src/mir/eval.rs b/crates/hir-ty/src/mir/eval.rs index fd98141af6..90b8092b4b 100644 --- a/crates/hir-ty/src/mir/eval.rs +++ b/crates/hir-ty/src/mir/eval.rs @@ -1710,7 +1710,14 @@ impl Evaluator<'_> { } ConstScalar::Unknown => not_supported!("evaluating unknown const"), }; - let patch_map = memory_map.transform_addresses(|b, align| { + let patch_map = memory_map.transform_addresses(|b, mut align| { + // Prevent recursive addresses is adts and slices + match ((&b[..b.len() / 2]).try_into(), HEAP_OFFSET.checked_add(align)) { + (Ok(arr), Some(new_addr)) if usize::from_le_bytes(arr) == new_addr => { + align *= 2; + } + _ => (), + }; let addr = self.heap_allocate(b.len(), align)?; self.write_memory(addr, b)?; Ok(addr.to_usize()) |