language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-26 13:29:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

minor tweaks

Browse source
This commit is contained in:
Folkert 2022-09-03 14:45:22 +02:00
parent ff7df65f36
commit af74f72f8a
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
1 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/linker/src/lib.rs
View file

@ -2544,13 +2544,6 @@ pub fn surgery_elf(
// First decide on sections locations and then recode every exact symbol locations. // First decide on sections locations and then recode every exact symbol locations.
// Copy sections and resolve their symbols/relocations.
let symbols = app_obj.symbols().collect::<Vec<Symbol>>();
let mut section_offset_map: MutMap<SectionIndex, (usize, usize)> = MutMap::default();
let mut symbol_vaddr_map: MutMap<SymbolIndex, usize> = MutMap::default();
let mut app_func_vaddr_map: MutMap<String, usize> = MutMap::default();
let mut app_func_size_map: MutMap<String, u64> = MutMap::default();
// TODO: In the future Roc may use a data section to store memoized toplevel thunks // TODO: In the future Roc may use a data section to store memoized toplevel thunks
// in development builds for caching the results of top-level constants // in development builds for caching the results of top-level constants
let rodata_sections: Vec<Section> = app_obj let rodata_sections: Vec<Section> = app_obj
@ -2572,6 +2565,13 @@ pub fn surgery_elf(
internal_error!("No text sections found. This application has no code."); internal_error!("No text sections found. This application has no code.");
} }
// Copy sections and resolve their symbols/relocations.
let symbols = app_obj.symbols().collect::<Vec<Symbol>>();
let mut section_offset_map: MutMap<SectionIndex, (usize, usize)> = MutMap::default();
let mut symbol_vaddr_map: MutMap<SymbolIndex, usize> = MutMap::default();
let mut app_func_vaddr_map: MutMap<String, usize> = MutMap::default();
let mut app_func_size_map: MutMap<String, u64> = MutMap::default();
// Calculate addresses and load symbols. // Calculate addresses and load symbols.
// Note, it is important the bss sections come after the rodata sections. // Note, it is important the bss sections come after the rodata sections.
for sec in rodata_sections for sec in rodata_sections
@ -2914,9 +2914,7 @@ pub fn surgery_elf(
LittleEndian, LittleEndian,
match app_func_size_map.get(func_name) { match app_func_size_map.get(func_name) {
Some(size) => *size, Some(size) => *size,
None => { None => internal_error!("Size missing for: {func_name}"),
internal_error!("Size missing for: {}", func_name);
}
}, },
); );
} }