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

Merge pull request #3192 from alexcrichton/no-comp-dir

Browse Source 
Don't require `DW_AT_comp_dir` for debuginfo
This commit is contained in:
Nick Fitzgerald
2021-08-17 14:43:35 -07:00
committed by GitHub
parent c6cd1008f8 1bdafbf226
commit 9311c38f7e
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
crates/debug/src/transform/line_program.rs
View File

@@ -63,17 +63,20 @@ where
}; };
let comp_dir = root.attr_value(gimli::DW_AT_comp_dir)?; let comp_dir = root.attr_value(gimli::DW_AT_comp_dir)?;
let comp_name = root.attr_value(gimli::DW_AT_name)?; let comp_name = root.attr_value(gimli::DW_AT_name)?;
let out_comp_dir = clone_attr_string( let out_comp_dir = match &comp_dir {
comp_dir.as_ref().context("comp_dir")?, Some(comp_dir) => Some(clone_attr_string(
gimli::DW_FORM_strp, comp_dir,
unit, gimli::DW_FORM_strp,
debug_str, unit,
debug_str_offsets, debug_str,
debug_line_str, debug_str_offsets,
out_strings, debug_line_str,
)?; out_strings,
)?),
None => None,
};
let out_comp_name = clone_attr_string( let out_comp_name = clone_attr_string(
comp_name.as_ref().context("comp_name")?, comp_name.as_ref().context("missing DW_AT_name attribute")?,
gimli::DW_FORM_strp, gimli::DW_FORM_strp,
unit, unit,
debug_str, debug_str,
@@ -102,7 +105,7 @@ where
let mut out_program = write::LineProgram::new( let mut out_program = write::LineProgram::new(
out_encoding, out_encoding,
line_encoding, line_encoding,
out_comp_dir, out_comp_dir.unwrap_or_else(|| write::LineString::String(Vec::new())),
out_comp_name, out_comp_name,
None, None,
); );