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

Merge pull request #1632 from cfallin/aarch64-fix-srclocs

Browse Source 
MachInst backend: attach SourceLoc span information to all ranges.
This commit is contained in:
Chris Fallin
2020-04-30 16:13:55 -07:00
committed by GitHub
parent 9d3a84c756 964c6087bd
commit 8393412c40
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cranelift/codegen/src/machinst/vcode.rs
View File

@@ -552,7 +552,7 @@ impl<I: VCodeInst> VCode<I> {
let code_section = sections.get_section(code_idx);
let flags = self.abi.flags();
let mut cur_srcloc = SourceLoc::default();
let mut cur_srcloc = None;
for &block in &self.final_block_order {
let new_offset = I::align_basic_block(code_section.cur_offset_from_start());
while new_offset > code_section.cur_offset_from_start() {
@@ -565,22 +565,20 @@ impl<I: VCodeInst> VCode<I> {
let (start, end) = self.block_ranges[block as usize];
for iix in start..end {
let srcloc = self.srclocs[iix as usize];
if srcloc != cur_srcloc {
if !cur_srcloc.is_default() {
if cur_srcloc != Some(srcloc) {
if cur_srcloc.is_some() {
code_section.end_srcloc();
}
if !srcloc.is_default() {
code_section.start_srcloc(srcloc);
}
cur_srcloc = srcloc;
code_section.start_srcloc(srcloc);
cur_srcloc = Some(srcloc);
}
self.insts[iix as usize].emit(code_section, flags);
}
if !cur_srcloc.is_default() {
if cur_srcloc.is_some() {
code_section.end_srcloc();
cur_srcloc = SourceLoc::default();
cur_srcloc = None;
}
}