Skip to content

[Object] Provide operator< for ELFSymbolRef #89861

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 6 commits into from
Apr 29, 2024
Merged

[Object] Provide operator< for ELFSymbolRef #89861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b6630e8
[Object] Provide operator< for ELFSymbolRef
aaupov Apr 24, 2024
0e9aab8
Add ELFObjectFileTest::ELFSymbolRefLess
aaupov Apr 24, 2024
978d8fb
Fix typo
aaupov Apr 25, 2024
fb87c76
Added tests, addressed comments
aaupov Apr 26, 2024
2249f8d
Add helper, rename variables, prune redundant checks
aaupov Apr 29, 2024
2437017
Remove tautological comments
aaupov Apr 29, 2024
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
8 changes: 8 additions & 0 deletions llvm/include/llvm/Object/ELFObjectFile.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,14 @@ class ELFSymbolRef : public SymbolRef {
}
};

inline bool operator<(const ELFSymbolRef &A, const ELFSymbolRef &B) {
const DataRefImpl &DRIA = A.getRawDataRefImpl();
const DataRefImpl &DRIB = B.getRawDataRefImpl();
if (DRIA.d.a == DRIB.d.a)
return DRIA.d.b < DRIB.d.b;
return DRIA.d.a < DRIB.d.a;
}

class elf_symbol_iterator : public symbol_iterator {
public:
elf_symbol_iterator(const basic_symbol_iterator &B)
Expand Down
43 changes: 43 additions & 0 deletions llvm/unittests/Object/ELFObjectFileTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1504,3 +1504,46 @@ TEST(ELFObjectFileTest, GetSectionAndRelocations) {
"SHT_RELA section with index 1: failed to get a "
"relocated section: invalid section index: 255");
}

TEST(ELFObjectFileTest, ELFSymbolRefLess) {
SmallString<0> Storage;
Expected<ELFObjectFile<ELF64LE>> ElfOrErr = toBinary<ELF64LE>(Storage, R"(
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
Type: ET_DYN
Machine: EM_X86_64
)");

ASSERT_THAT_EXPECTED(ElfOrErr, Succeeded());
const ELFObjectFile<ELF64LE> &Obj = *ElfOrErr;

const uint32_t ValLow = 0x00000001;
const uint32_t ValHigh = 0x00000100;

auto MakeSymbol = [&Obj](size_t SymtabIndex, size_t SymbolIndex) {
DataRefImpl Data;
Data.d.a = SymtabIndex;
Data.d.b = SymbolIndex;
SymbolRef Sym(Data, &Obj);
return ELFSymbolRef(Sym);
};

ELFSymbolRef ELFSymLowLow = MakeSymbol(ValLow, ValLow);
ELFSymbolRef ELFSymLowHigh = MakeSymbol(ValLow, ValHigh);
ELFSymbolRef ELFSymHighLow = MakeSymbol(ValHigh, ValLow);
ELFSymbolRef ELFSymHighHigh = MakeSymbol(ValHigh, ValHigh);

EXPECT_TRUE(ELFSymLowLow < ELFSymLowHigh);
EXPECT_FALSE(ELFSymLowHigh < ELFSymLowLow);
EXPECT_FALSE(ELFSymLowLow < ELFSymLowLow);

EXPECT_TRUE(ELFSymLowLow < ELFSymHighHigh);
EXPECT_TRUE(ELFSymLowHigh < ELFSymHighLow);
EXPECT_TRUE(ELFSymLowLow < ELFSymHighLow);

EXPECT_FALSE(ELFSymHighLow < ELFSymLowHigh);
EXPECT_FALSE(ELFSymHighHigh < ELFSymLowLow);
EXPECT_FALSE(ELFSymHighLow < ELFSymLowLow);
}