Merge pull request #3014 from uweigand/fix-srcloc

Fix updating srclocs in truncate_last_branch
2021-06-22 10:26:11 -07:00
parent fa1a04d002 a90ab8a0cf
commit 4b25e3e10a
1 changed files with 5 additions and 1 deletions
--- a/cranelift/codegen/src/machinst/buffer.rs
+++ b/cranelift/codegen/src/machinst/buffer.rs
@@ -680,10 +680,14 @@ impl<I: VCodeInst> MachBuffer<I> {
        //    (end of buffer)
        self.data.truncate(b.start as usize);
        self.fixup_records.truncate(b.fixup);
-        while let Some(last_srcloc) = self.srclocs.last() {
+        while let Some(mut last_srcloc) = self.srclocs.last_mut() {
            if last_srcloc.end <= b.start {
                break;
            }
+            if last_srcloc.start < b.start {
+                last_srcloc.end = b.start;
+                break;
+            }
            self.srclocs.pop();
        }
        // State: