Index: lld/MachO/Driver.cpp =================================================================== --- lld/MachO/Driver.cpp +++ lld/MachO/Driver.cpp @@ -685,9 +685,6 @@ warn(Twine("unknown --icf=OPTION `") + icfLevelStr + "', defaulting to `none'"); icfLevel = ICFLevel::none; - } else if (icfLevel == ICFLevel::safe) { - warn(Twine("`--icf=safe' is not yet implemented, reverting to `none'")); - icfLevel = ICFLevel::none; } return icfLevel; } @@ -1509,8 +1506,11 @@ // ICF assumes that all literals have been folded already, so we must run // foldIdenticalLiterals before foldIdenticalSections. foldIdenticalLiterals(); - if (config->icfLevel != ICFLevel::none) + if (config->icfLevel != ICFLevel::none) { + if (config->icfLevel == ICFLevel::safe) + markAddrSigSymbols(inputFiles); foldIdenticalSections(); + } // Write to an output file. if (target->wordSize == 8) Index: lld/MachO/ICF.h =================================================================== --- lld/MachO/ICF.h +++ lld/MachO/ICF.h @@ -9,12 +9,17 @@ #ifndef LLD_MACHO_ICF_H #define LLD_MACHO_ICF_H +#include "InputFiles.h" #include "lld/Common/LLVM.h" +#include "llvm/ADT/SetVector.h" #include namespace lld { namespace macho { +class Symbol; +void markAddrSigSymbols(llvm::SetVector &inputFiles); +void markSymAsAddrSig(Symbol *s); void foldIdenticalSections(); } // namespace macho Index: lld/MachO/ICF.cpp =================================================================== --- lld/MachO/ICF.cpp +++ lld/MachO/ICF.cpp @@ -8,11 +8,14 @@ #include "ICF.h" #include "ConcatOutputSection.h" +#include "Config.h" #include "InputSection.h" +#include "SymbolTable.h" #include "Symbols.h" #include "UnwindInfoSection.h" #include "lld/Common/CommonLinkerContext.h" +#include "llvm/Support/LEB128.h" #include "llvm/Support/Parallel.h" #include "llvm/Support/TimeProfiler.h" #include "llvm/Support/xxhash.h" @@ -354,6 +357,39 @@ } } +void macho::markSymAsAddrSig(Symbol *s) { + if (auto *d = dyn_cast_or_null(s)) + if (d->isec) + d->isec->keepUnique = true; +} + +void macho::markAddrSigSymbols(SetVector &inputFiles) { + for (InputFile *file : inputFiles) { + ObjFile *obj = dyn_cast(file); + if (!obj) + continue; + + Section *addrSigSection = obj->addrSigSection; + if (!addrSigSection) + continue; + assert(addrSigSection->subsections.size() == 1); + + Subsection *subSection = &addrSigSection->subsections[0]; + ArrayRef &contents = subSection->isec->data; + + const uint8_t *pData = contents.begin(); + while (pData != contents.end()) { + unsigned size; + const char *err; + uint32_t symIndex = decodeULEB128(pData, &size, contents.end(), &err); + if (err) + fatal(toString(file) + ": could not decode addrsig section: " + err); + markSymAsAddrSig(obj->symbols[symIndex]); + pData += size; + } + } +} + void macho::foldIdenticalSections() { TimeTraceScope timeScope("Fold Identical Code Sections"); // The ICF equivalence-class segregation algorithm relies on pre-computed @@ -376,7 +412,7 @@ // FIXME: consider non-code __text sections as hashable? bool isHashable = (isCodeSection(isec) || isCfStringSection(isec) || isClassRefsSection(isec)) && - !isec->shouldOmitFromOutput() && + !isec->keepUnique && !isec->shouldOmitFromOutput() && sectionType(isec->getFlags()) == MachO::S_REGULAR; if (isHashable) { hashable.push_back(isec); Index: lld/MachO/InputFiles.h =================================================================== --- lld/MachO/InputFiles.h +++ lld/MachO/InputFiles.h @@ -149,6 +149,7 @@ const uint32_t modTime; std::vector debugSections; std::vector callGraph; + Section *addrSigSection = nullptr; private: Section *compactUnwindSection = nullptr; Index: lld/MachO/InputFiles.cpp =================================================================== --- lld/MachO/InputFiles.cpp +++ lld/MachO/InputFiles.cpp @@ -355,6 +355,9 @@ // spurious duplicate symbol errors, we do not parse these sections. // TODO: Evaluate whether the bitcode metadata is needed. } else { + if (name == section_names::addrSig) + addrSigSection = sections.back(); + auto *isec = make(section, data, align); if (isDebugSection(isec->getFlags()) && isec->getSegName() == segment_names::dwarf) { Index: lld/MachO/InputSection.h =================================================================== --- lld/MachO/InputSection.h +++ lld/MachO/InputSection.h @@ -71,6 +71,8 @@ public: // is address assigned? bool isFinal = false; + // keep the address of the symbol unique in the final binary ? + bool keepUnique = false; uint32_t align = 1; OutputSection *parent = nullptr; @@ -328,6 +330,7 @@ constexpr const char unwindInfo[] = "__unwind_info"; constexpr const char weakBinding[] = "__weak_binding"; constexpr const char zeroFill[] = "__zerofill"; +constexpr const char addrSig[] = "__llvm_addrsig"; } // namespace section_names Index: lld/test/MachO/icf-options.s =================================================================== --- lld/test/MachO/icf-options.s +++ lld/test/MachO/icf-options.s @@ -8,8 +8,8 @@ # RUN: | FileCheck %s --check-prefix=DIAG-EMPTY --allow-empty # RUN: %lld -lSystem -no_deduplicate -o %t/no_dedup %t/main.o 2>&1 \ # RUN: | FileCheck %s --check-prefix=DIAG-EMPTY --allow-empty -# RUN: not %lld -lSystem --icf=safe -o %t/safe %t/main.o 2>&1 \ -# RUN: | FileCheck %s --check-prefix=DIAG-SAFE +# RUN: %lld -lSystem --icf=safe -o %t/safe %t/main.o 2>&1 \ +# RUN: | FileCheck %s --check-prefix=DIAG-EMPTY --allow-empty # RUN: not %lld -lSystem --icf=junk -o %t/junk %t/main.o 2>&1 \ # RUN: | FileCheck %s --check-prefix=DIAG-JUNK # RUN: %lld -lSystem --icf=all -no_deduplicate -o %t/none2 %t/main.o 2>&1 \ @@ -18,7 +18,6 @@ # RUN: | FileCheck %s --check-prefix=DIAG-EMPTY --allow-empty # DIAG-EMPTY-NOT: {{.}} -# DIAG-SAFE: `--icf=safe' is not yet implemented, reverting to `none' # DIAG-JUNK: unknown --icf=OPTION `junk', defaulting to `none' # RUN: llvm-objdump -d --syms %t/all | FileCheck %s --check-prefix=FOLD Index: lld/test/MachO/icf-safe.s =================================================================== --- /dev/null +++ lld/test/MachO/icf-safe.s @@ -0,0 +1,62 @@ +; RUN: rm -rf %t; mkdir %t +; RUN: llc -filetype=obj %s -O3 -o %t/icf-obj.o -enable-machine-outliner=never -mtriple arm64-apple-ios -addrsig +; RUN: %lld -arch arm64 -lSystem --icf=safe -dylib -o %t/icf-safe.dylib %t/icf-obj.o +; RUN: %lld -arch arm64 -lSystem --icf=all -dylib -o %t/icf-all.dylib %t/icf-obj.o +; RUN: llvm-objdump %t/icf-safe.dylib -d --macho | FileCheck %s --check-prefix=ICFSAFE +; RUN: llvm-objdump %t/icf-all.dylib -d --macho | FileCheck %s --check-prefix=ICFALL + +; ICFSAFE-LABEL: _callAllFunctions +; ICFSAFE: {{[0-9a-f \:]*}} bl _func02 +; ICFSAFE-NEXT: {{[0-9a-f \:]*}} bl _func02 +; ICFSAFE-NEXT: {{[0-9a-f \:]*}} bl _func03_takeaddr + +; ICFALL-LABEL: _callAllFunctions +; ICFALL: {{[0-9a-f \:]*}} bl _func03_takeaddr +; ICFALL-NEXT: {{[0-9a-f \:]*}} bl _func03_takeaddr +; ICFALL-NEXT: {{[0-9a-f \:]*}} bl _func03_takeaddr + +target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128" +target triple = "arm64-apple-ios7.0.0" + +@result = global i32 0, align 4 + +; Function Attrs: minsize nofree noinline norecurse nounwind optsize ssp uwtable +define void @func01() local_unnamed_addr #0 { +entry: + %0 = load volatile i32, ptr @result, align 4 + %add = add nsw i32 %0, 1 + store volatile i32 %add, ptr @result, align 4 + ret void +} + +; Function Attrs: minsize nofree noinline norecurse nounwind optsize ssp uwtable +define void @func02() local_unnamed_addr #0 { +entry: + %0 = load volatile i32, ptr @result, align 4 + %add = add nsw i32 %0, 1 + store volatile i32 %add, ptr @result, align 4 + ret void +} + +; Function Attrs: minsize nofree noinline norecurse nounwind optsize ssp uwtable +define void @func03_takeaddr() #0 { +entry: + %0 = load volatile i32, ptr @result, align 4 + %add = add nsw i32 %0, 1 + store volatile i32 %add, ptr @result, align 4 + ret void +} + +; Function Attrs: minsize nofree norecurse nounwind optsize ssp uwtable +define void @callAllFunctions() local_unnamed_addr { +entry: + tail call void @func01() + tail call void @func02() + tail call void @func03_takeaddr() + %0 = load volatile i32, ptr @result, align 4 + %add = add nsw i32 %0, ptrtoint (ptr @func03_takeaddr to i32) + store volatile i32 %add, ptr @result, align 4 + ret void +} + +attributes #0 = { noinline }