language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-08-03 11:52:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge pull request #7455 from kubkon/macho-no-compressed-ranges

Browse source 
linker/macho: remove redundant checks for compressed sections
This commit is contained in:
Luke Boswell 2025-01-05 07:15:04 +11:00 • committed by GitHub
commit c85c864b5f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

49
crates/linker/src/macho.rs
View file

@ -3,9 +3,8 @@ use iced_x86::{Decoder, DecoderOptions, Instruction, OpCodeOperandKind, OpKind};
use memmap2::MmapMut;
use object::macho;
use object::{
CompressedFileRange, CompressionFormat, LittleEndian as LE, Object, ObjectSection,
ObjectSymbol, RelocationFlags, RelocationKind, RelocationTarget, Section, SectionIndex,
SectionKind, Symbol, SymbolIndex, SymbolSection,
LittleEndian as LE, Object, ObjectSection, ObjectSymbol, RelocationFlags, RelocationKind,
RelocationTarget, Section, SectionIndex, SectionKind, Symbol, SymbolIndex, SymbolSection,
};
use roc_collections::all::MutMap;
use roc_error_macros::internal_error;
@ -187,29 +186,17 @@ impl<'a> Surgeries<'a> {
}
fn append_text_section(&mut self, object_bytes: &[u8], sec: &Section, verbose: bool) {
let (file_offset, compressed) = match sec.compressed_file_range() {
Ok(CompressedFileRange {
format: CompressionFormat::None,
offset,
..
}) => (offset, false),
Ok(range) => (range.offset, true),
Err(err) => {
internal_error!(
"Issues dealing with section compression for {:+x?}: {}",
sec,
err
);
}
let file_offset = if let Some((file_offset, _)) = sec.file_range() {
file_offset
} else {
internal_error!("Could not get file range for {sec:+x?}");
};
let data = match sec.uncompressed_data() {
let data = match sec.data() {
Ok(data) => data,
Err(err) => {
internal_error!("Failed to load text section, {:+x?}: {}", sec, err);
}
Err(err) => internal_error!("Failed to load text section, {:+x?}: {err}", sec),
};
let mut decoder = Decoder::with_ip(64, &data, sec.address(), DecoderOptions::NONE);
let mut decoder = Decoder::with_ip(64, data, sec.address(), DecoderOptions::NONE);
let mut inst = Instruction::default();
while decoder.can_decode() {
@ -225,10 +212,6 @@ impl<'a> Surgeries<'a> {
Ok(OpKind::NearBranch16 | OpKind::NearBranch32 | OpKind::NearBranch64) => {
let target = inst.near_branch_target();
if let Some(func_name) = self.app_func_addresses.get(&target) {
if compressed {
internal_error!("Surgical linking does not work with compressed text sections: {:+x?}", sec);
}
if verbose {
println!(
"Found branch from {:+x} to {:+x}({})",
@ -343,16 +326,10 @@ pub(crate) fn preprocess_macho_le(
let (plt_address, plt_offset) = match exec_obj.section_by_name(plt_section_name) {
Some(section) => {
let file_offset = match section.compressed_file_range() {
Ok(
range @ CompressedFileRange {
format: CompressionFormat::None,
..
},
) => range.offset,
_ => {
internal_error!("Surgical linking does not work with compressed plt section");
}
let file_offset = if let Some((file_offset, _)) = section.file_range() {
file_offset
} else {
internal_error!("Could not get file range for {section:+x?}");
};
(section.address(), file_offset)
}