From fb893038862ad045d8ad1c624e0e954042a2f01a Mon Sep 17 00:00:00 2001 From: KyleMiles Date: Wed, 15 May 2024 13:15:04 -0400 Subject: DWARF Import : Add support for variable arguments --- rust/examples/dwarf/dwarf_import/src/functions.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'rust/examples/dwarf/dwarf_import/src/functions.rs') diff --git a/rust/examples/dwarf/dwarf_import/src/functions.rs b/rust/examples/dwarf/dwarf_import/src/functions.rs index 1d8879a0..016c4033 100644 --- a/rust/examples/dwarf/dwarf_import/src/functions.rs +++ b/rust/examples/dwarf/dwarf_import/src/functions.rs @@ -23,14 +23,15 @@ fn get_parameters>( entry: &DebuggingInformationEntry, debug_info_builder_context: &DebugInfoBuilderContext, debug_info_builder: &mut DebugInfoBuilder, -) -> Vec> { +) -> (Vec>, bool) { if !entry.has_children() { - vec![] + (vec![], false) } else { // We make a new tree from the current entry to iterate over its children let mut sub_die_tree = unit.entries_tree(Some(entry.offset())).unwrap(); let root = sub_die_tree.root().unwrap(); + let mut variable_arguments = false; let mut result = vec![]; let mut children = root.children(); while let Some(child) = children.next().unwrap() { @@ -53,11 +54,11 @@ fn get_parameters>( result.push(None) } } - constants::DW_TAG_unspecified_parameters => (), + constants::DW_TAG_unspecified_parameters => variable_arguments = true, _ => (), } } - result + (result, variable_arguments) } } @@ -72,7 +73,7 @@ pub(crate) fn parse_function_entry>( let raw_name = get_raw_name(unit, entry, debug_info_builder_context); let return_type = get_type(unit, entry, debug_info_builder_context, debug_info_builder); let address = get_start_address(unit, entry, debug_info_builder_context); - let parameters = get_parameters(unit, entry, debug_info_builder_context, debug_info_builder); + let (parameters, variable_arguments) = get_parameters(unit, entry, debug_info_builder_context, debug_info_builder); - debug_info_builder.insert_function(full_name, raw_name, return_type, address, parameters); + debug_info_builder.insert_function(full_name, raw_name, return_type, address, parameters, variable_arguments); } -- cgit v1.3.1