diff options
| author | Martin Storsjö <martin@martin.st> | 2022-08-02 10:29:01 +0300 |
|---|---|---|
| committer | Tom Stellard <tstellar@redhat.com> | 2022-08-05 01:13:43 -0700 |
| commit | abf0175833e3692a1238982305014ed38921ae4b (patch) | |
| tree | e7aeb2468ce44648a2edc92859606cc8dfd2161b | |
| parent | e7a776ef4a4588ccd0f69dcbbf2b45f0e23c9f3f (diff) | |
[LLD] [MachO] Fix GCC build warnings
This fixes the following warnings produced by GCC 9:
../tools/lld/MachO/Arch/ARM64.cpp: In member function ‘void {anonymous}::OptimizationHintContext::applyAdrpLdr(const lld::macho::OptimizationHint&)’:
../tools/lld/MachO/Arch/ARM64.cpp:448:18: warning: comparison of integer expressions of different signedness: ‘int64_t’ {aka ‘long int’} and ‘uint64_t’ {aka ‘long unsigned int’} [-Wsign-compare]
448 | if (ldr.offset != (rel1->referentVA & 0xfff))
| ~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../tools/lld/MachO/UnwindInfoSection.cpp: In function ‘bool canFoldEncoding(compact_unwind_encoding_t)’:
../tools/lld/MachO/UnwindInfoSection.cpp:404:44: warning: comparison between ‘enum<unnamed>’ and ‘enum<unnamed>’ [-Wenum-compare]
404 | static_assert(UNWIND_X86_64_MODE_MASK == UNWIND_X86_MODE_MASK, "");
| ^~~~~~~~~~~~~~~~~~~~
../tools/lld/MachO/UnwindInfoSection.cpp:405:49: warning: comparison between ‘enum<unnamed>’ and ‘enum<unnamed>’ [-Wenum-compare]
405 | static_assert(UNWIND_X86_64_MODE_STACK_IND == UNWIND_X86_MODE_STACK_IND, "");
| ^~~~~~~~~~~~~~~~~~~~~~~~~
Differential Revision: https://reviews.llvm.org/D130970
(cherry picked from commit 59c6f418fa3c5d6f5c8b75ebd817be8113de7931)
| -rw-r--r-- | lld/MachO/Arch/ARM64.cpp | 2 | ||||
| -rw-r--r-- | lld/MachO/UnwindInfoSection.cpp | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lld/MachO/Arch/ARM64.cpp b/lld/MachO/Arch/ARM64.cpp index 46e935aa1fd1..c05fe8da8ca6 100644 --- a/lld/MachO/Arch/ARM64.cpp +++ b/lld/MachO/Arch/ARM64.cpp @@ -444,7 +444,7 @@ void OptimizationHintContext::applyAdrpLdr(const OptimizationHint &hint) { Optional<PerformedReloc> rel2 = findReloc(hint.offset0 + hint.delta[0]); if (!rel1 || !rel2) return; - if (ldr.offset != (rel1->referentVA & 0xfff)) + if (ldr.offset != static_cast<int64_t>(rel1->referentVA & 0xfff)) return; ldr.offset = rel1->referentVA - rel2->rel.offset - isec->getVA(); if (!isLiteralLdrEligible(ldr)) diff --git a/lld/MachO/UnwindInfoSection.cpp b/lld/MachO/UnwindInfoSection.cpp index 322057947a3d..c3f563d5572b 100644 --- a/lld/MachO/UnwindInfoSection.cpp +++ b/lld/MachO/UnwindInfoSection.cpp @@ -401,8 +401,12 @@ static bool canFoldEncoding(compact_unwind_encoding_t encoding) { // of the unwind info's unwind address, two functions that have identical // unwind info can't be folded if it's using this encoding since both // entries need unique addresses. - static_assert(UNWIND_X86_64_MODE_MASK == UNWIND_X86_MODE_MASK, ""); - static_assert(UNWIND_X86_64_MODE_STACK_IND == UNWIND_X86_MODE_STACK_IND, ""); + static_assert(static_cast<uint32_t>(UNWIND_X86_64_MODE_MASK) == + static_cast<uint32_t>(UNWIND_X86_MODE_MASK), + ""); + static_assert(static_cast<uint32_t>(UNWIND_X86_64_MODE_STACK_IND) == + static_cast<uint32_t>(UNWIND_X86_MODE_STACK_IND), + ""); if ((target->cpuType == CPU_TYPE_X86_64 || target->cpuType == CPU_TYPE_X86) && (encoding & UNWIND_X86_64_MODE_MASK) == UNWIND_X86_64_MODE_STACK_IND) { // FIXME: Consider passing in the two function addresses and getting |