Use the new section/symbol_flags_mut helpers in cranelift-object (bytecodealliance#11425)

* Use the new section/symbol_flags_mut helpers in cranelift-object

This ensures that the correct default flags are used.

* Add vets

---------

Co-authored-by: Alex Crichton <[email protected]>

Author: 2 people

Cargo.lock

@@ -347,7 +347,7 @@ json-from-wast = "0.236.0"
 arbitrary = "1.4.0"
 mutatis = "0.3.2"
 cc = "1.0"
-object = { version = "0.37.0", default-features = false, features = ['read_core', 'elf'] }
+object = { version = "0.37.3", default-features = false, features = ['read_core', 'elf'] }
 gimli = { version = "0.32.0", default-features = false, features = ['read'] }
 addr2line = { version = "0.25.0", default-features = false }
 anyhow = { version = "1.0.93", default-features = false }

Cargo.toml

@@ -454,41 +454,15 @@ impl Module for ObjectModule {
 
         if used {
             match self.object.format() {
-                object::BinaryFormat::Elf => {
-                    let section = self.object.section_mut(section);
-                    match &mut section.flags {
-                        SectionFlags::None => {
-                            // Explicitly specify default flags as SectionFlags::Elf overwrites them
-                            let sh_flags = if decl.tls {
-                                elf::SHF_ALLOC | elf::SHF_WRITE | elf::SHF_TLS
-                            } else if decl.writable || !relocs.is_empty() {
-                                elf::SHF_ALLOC | elf::SHF_WRITE
-                            } else {
-                                elf::SHF_ALLOC
-                            };
-                            section.flags = SectionFlags::Elf {
-                                sh_flags: u64::from(sh_flags | elf::SHF_GNU_RETAIN),
-                            }
-                        }
-                        SectionFlags::Elf { sh_flags } => {
-                            *sh_flags |= u64::from(elf::SHF_GNU_RETAIN)
-                        }
-                        _ => unreachable!(),
-                    }
-                }
+                object::BinaryFormat::Elf => match self.object.section_flags_mut(section) {
+                    SectionFlags::Elf { sh_flags } => *sh_flags |= u64::from(elf::SHF_GNU_RETAIN),
+                    _ => unreachable!(),
+                },
                 object::BinaryFormat::Coff => {}
-                object::BinaryFormat::MachO => {
-                    let symbol = self.object.symbol_mut(symbol);
-                    assert!(matches!(symbol.flags, SymbolFlags::None));
-                    let n_desc = if decl.linkage == Linkage::Preemptible {
-                        object::macho::N_WEAK_DEF
-                    } else {
-                        0
-                    };
-                    symbol.flags = SymbolFlags::MachO {
-                        n_desc: n_desc | object::macho::N_NO_DEAD_STRIP,
-                    }
-                }
+                object::BinaryFormat::MachO => match self.object.symbol_flags_mut(symbol) {
+                    SymbolFlags::MachO { n_desc } => *n_desc |= object::macho::N_NO_DEAD_STRIP,
+                    _ => unreachable!(),
+                },
                 _ => unreachable!(),
             }
         }

cranelift/object/src/backend.rs

@@ -2909,6 +2909,12 @@ criteria = "safe-to-deploy"
 delta = "0.36.5 -> 0.37.1"
 notes = "New object file formats, new formatting, new other minor changes, no new `unsafe`."
 
+[[audits.object]]
+who = "Alex Crichton <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "0.37.1 -> 0.37.3"
+notes = "Lots of new support for new object features, no new unsafe or anything suspicious."
+
 [[audits.once_cell]]
 who = "Chris Fallin <[email protected]>"
 criteria = "safe-to-deploy"