From 2c508cf583f89f811d507b5cab2e869c11a0c0f1 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Thu, 22 Jul 2021 21:46:47 -0400 Subject: [PATCH] [lld/mac] Don't crash on absolute symbols in order files Absolute symbols have a nullptr isec. buildInputSectionPriorities() would defer isec, causing crashes. Ordering absolute symbols doesn't make sense, so just ignore them. This seems to match ld64. Differential Revision: https://reviews.llvm.org/D106628 --- lld/MachO/Writer.cpp | 3 +++ lld/test/MachO/order-file.s | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/lld/MachO/Writer.cpp b/lld/MachO/Writer.cpp index 26c03f8..81b3491 100644 --- a/lld/MachO/Writer.cpp +++ b/lld/MachO/Writer.cpp @@ -847,6 +847,9 @@ static DenseMap buildInputSectionPriorities() { return sectionPriorities; auto addSym = [&](Defined &sym) { + if (sym.isAbsolute()) + return; + auto it = config->priorities.find(sym.getName()); if (it == config->priorities.end()) return; diff --git a/lld/test/MachO/order-file.s b/lld/test/MachO/order-file.s index d0efefc..e0ca735 100644 --- a/lld/test/MachO/order-file.s +++ b/lld/test/MachO/order-file.s @@ -2,6 +2,7 @@ # RUN: rm -rf %t; split-file %s %t # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/test.s -o %t/test.o # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/foo.s -o %t/foo.o +# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/abs.s -o %t/abs.o # RUN: llvm-ar rcs %t/foo.a %t/foo.o # FOO-FIRST: <_bar>: @@ -101,6 +102,9 @@ # RUN: %lld -lSystem -o %t/test-alias %t/foo.o %t/test.o -order_file %t/ord-alias # RUN: llvm-objdump -d %t/test-alias | FileCheck %s --check-prefix=FOO-FIRST +## Absolute in symbols in order files make no sense. Just ignore them. +# RUN: %lld -lSystem -dylib -o %t/test-abs %t/abs.o -order_file %t/ord-abs + #--- ord-1 -[Foo doFoo:andBar:] # just a comment _main # another comment @@ -160,6 +164,9 @@ _bar _main -[Foo doFoo:andBar:] +#--- ord-abs +_abs + #--- foo.s .globl "-[Foo doFoo:andBar:]" "-[Foo doFoo:andBar:]": @@ -176,3 +183,6 @@ _main: .section __DWARF,__debug_aranges,regular,debug ltmp1: .byte 0 + +#--- abs.s +_abs = 42 -- 2.7.4