Skip to content

[lld-macho] Always store symbol name length eagerly (NFC) #106906

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 3, 2024
Merged

[lld-macho] Always store symbol name length eagerly (NFC) #106906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lld/MachO/Symbols.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ uint64_t Symbol::getLazyPtrVA() const {
uint64_t Symbol::getGotVA() const { return in.got->getVA(gotIndex); }
uint64_t Symbol::getTlvVA() const { return in.tlvPointers->getVA(gotIndex); }

Defined::Defined(StringRefZ name, InputFile *file, InputSection *isec,
Defined::Defined(StringRef name, InputFile *file, InputSection *isec,
uint64_t value, uint64_t size, bool isWeakDef, bool isExternal,
bool isPrivateExtern, bool includeInSymtab,
bool isReferencedDynamically, bool noDeadStrip,
Expand Down
29 changes: 9 additions & 20 deletions lld/MachO/Symbols.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,6 @@ namespace macho {

class MachHeaderSection;

struct StringRefZ {
StringRefZ(const char *s) : data(s), size(-1) {}
StringRefZ(StringRef s) : data(s.data()), size(s.size()) {}

const char *data;
const uint32_t size;
};

class Symbol {
public:
enum Kind {
Expand All @@ -45,11 +37,7 @@ class Symbol {

Kind kind() const { return symbolKind; }

StringRef getName() const {
if (nameSize == (uint32_t)-1)
nameSize = strlen(nameData);
return {nameData, nameSize};
}
StringRef getName() const { return {nameData, nameSize}; }

bool isLive() const { return used; }
bool isLazy() const {
Expand Down Expand Up @@ -96,15 +84,15 @@ class Symbol {
InputFile *getFile() const { return file; }

protected:
Symbol(Kind k, StringRefZ name, InputFile *file)
: symbolKind(k), nameData(name.data), file(file), nameSize(name.size),
Symbol(Kind k, StringRef name, InputFile *file)
: symbolKind(k), nameData(name.data()), file(file), nameSize(name.size()),
isUsedInRegularObj(!file || isa<ObjFile>(file)),
used(!config->deadStrip) {}

Kind symbolKind;
const char *nameData;
InputFile *file;
mutable uint32_t nameSize;
uint32_t nameSize;

public:
// True if this symbol was referenced by a regular (non-bitcode) object.
Expand All @@ -116,7 +104,7 @@ class Symbol {

class Defined : public Symbol {
public:
Defined(StringRefZ name, InputFile *file, InputSection *isec, uint64_t value,
Defined(StringRef name, InputFile *file, InputSection *isec, uint64_t value,
uint64_t size, bool isWeakDef, bool isExternal, bool isPrivateExtern,
bool includeInSymtab, bool isReferencedDynamically, bool noDeadStrip,
bool canOverrideWeakDef = false, bool isWeakDefCanBeHidden = false,
Expand Down Expand Up @@ -206,7 +194,7 @@ enum class RefState : uint8_t { Unreferenced = 0, Weak = 1, Strong = 2 };

class Undefined : public Symbol {
public:
Undefined(StringRefZ name, InputFile *file, RefState refState,
Undefined(StringRef name, InputFile *file, RefState refState,
bool wasBitcodeSymbol)
: Symbol(UndefinedKind, name, file), refState(refState),
wasBitcodeSymbol(wasBitcodeSymbol) {
Expand Down Expand Up @@ -238,7 +226,7 @@ class Undefined : public Symbol {
// to regular defined symbols in a __common section.
class CommonSymbol : public Symbol {
public:
CommonSymbol(StringRefZ name, InputFile *file, uint64_t size, uint32_t align,
CommonSymbol(StringRef name, InputFile *file, uint64_t size, uint32_t align,
bool isPrivateExtern)
: Symbol(CommonKind, name, file), size(size),
align(align != 1 ? align : llvm::PowerOf2Ceil(size)),
Expand All @@ -255,7 +243,7 @@ class CommonSymbol : public Symbol {

class DylibSymbol : public Symbol {
public:
DylibSymbol(DylibFile *file, StringRefZ name, bool isWeakDef,
DylibSymbol(DylibFile *file, StringRef name, bool isWeakDef,
RefState refState, bool isTlv)
: Symbol(DylibKind, name, file), shouldReexport(false),
refState(refState), weakDef(isWeakDef), tlv(isTlv) {
Expand Down Expand Up @@ -301,6 +289,7 @@ class DylibSymbol : public Symbol {
}

bool shouldReexport : 1;

private:
RefState refState : 2;
const bool weakDef : 1;
Expand Down
Loading