T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2462 from cfallin/fix-sorted-debug-addr-transform

Browse Source 
Debug info: two fixes in x64 backend.
This commit is contained in:
Chris Fallin
2020-12-02 11:24:44 -08:00
committed by GitHub
parent 2f0abc3d74 60d7f7de0a
commit 1511cedaee
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cranelift/codegen/src/machinst/buffer.rs
View File

@@ -674,6 +674,12 @@ impl<I: VCodeInst> MachBuffer<I> {
// (end of buffer) // (end of buffer)
self.data.truncate(b.start as usize); self.data.truncate(b.start as usize);
self.fixup_records.truncate(b.fixup); self.fixup_records.truncate(b.fixup);
while let Some(last_srcloc) = self.srclocs.last() {
if last_srcloc.end <= b.start {
break;
}
self.srclocs.pop();
}
// State: // State:
// [PRE CODE] // [PRE CODE]
// cur_off, Offset b.start, b.labels_at_this_branch: // cur_off, Offset b.start, b.labels_at_this_branch:
@@ -1184,12 +1190,15 @@ impl<I: VCodeInst> MachBuffer<I> {
// incorrect. // incorrect.
assert!(self.fixup_records.is_empty()); assert!(self.fixup_records.is_empty());
let mut srclocs = self.srclocs;
srclocs.sort_by_key(|entry| entry.start);
MachBufferFinalized { MachBufferFinalized {
data: self.data, data: self.data,
relocs: self.relocs, relocs: self.relocs,
traps: self.traps, traps: self.traps,
call_sites: self.call_sites, call_sites: self.call_sites,
srclocs: self.srclocs, srclocs,
stack_maps: self.stack_maps, stack_maps: self.stack_maps,
} }
} }