vasilito
cb424d7448
verify-patch-sanity.py validates every active recipe .patch has internally- consistent hunk line counts — catching the 'malformed patch at line N' failure at commit/CI/preflight time instead of hours into a cook. This cycle hit that class three times (qtwaylandscanner, sddm, xwayland), each only discovered when cookbook tried to apply the patch. Running it across the repo found 29 latent malformed patches (validated against GNU patch: e.g. relibc/P3-sysv-ipc reproduces 'malformed patch at line 22'). They were harmless only because they sit in vendored recipes (baked, not re- applied) — but would fail on any version-bump re-derivation. --fix recounts the hunk headers (body untouched) and repaired all 29. Wired into build-preflight.sh (Phase 1.0D) and redbear-ci.yml, with a unit test (test-patch-sanity.sh). Skips archived/legacy trees and unvalidatable formats (empty placeholders, bare-@@ git hunks).
74 lines
2.5 KiB
C++
74 lines
2.5 KiB
C++
//===- bolt/Passes/FixRelaxationPass.cpp ------------------------*- C++ -*-===//
|
|
//
|
|
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
// See https://llvm.org/LICENSE.txt for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "bolt/Passes/FixRelaxationPass.h"
|
|
#include "bolt/Core/ParallelUtilities.h"
|
|
|
|
using namespace llvm;
|
|
|
|
namespace llvm {
|
|
namespace bolt {
|
|
|
|
// This function finds ADRP+ADD instruction sequences that originally before
|
|
// linker relaxations were ADRP+LDR. We've modified LDR/ADD relocation properly
|
|
// during relocation reading, so its targeting right symbol. As for ADRP its
|
|
// target is wrong before this pass since we won't be able to recognize and
|
|
// properly change R_AARCH64_ADR_GOT_PAGE relocation to
|
|
// R_AARCH64_ADR_PREL_PG_HI21 during relocation reading. Now we're searching for
|
|
// ADRP+ADD sequences, checking that ADRP points to the GOT-table symbol and the
|
|
// target of ADD is another symbol. When found change ADRP symbol reference to
|
|
// the ADDs one.
|
|
void FixRelaxations::runOnFunction(BinaryFunction &BF) {
|
|
BinaryContext &BC = BF.getBinaryContext();
|
|
for (BinaryBasicBlock &BB : BF) {
|
|
for (auto II = BB.begin(); II != BB.end(); ++II) {
|
|
MCInst &Adrp = *II;
|
|
if (BC.MIB->isPseudo(Adrp) || !BC.MIB->isADRP(Adrp))
|
|
continue;
|
|
|
|
const MCSymbol *AdrpSymbol = BC.MIB->getTargetSymbol(Adrp);
|
|
if (!AdrpSymbol || AdrpSymbol->getName() != "__BOLT_got_zero")
|
|
continue;
|
|
|
|
auto NextII = std::next(II);
|
|
if (NextII == BB.end())
|
|
continue;
|
|
|
|
const MCInst &Add = *NextII;
|
|
if (!BC.MIB->matchAdrpAddPair(Adrp, Add))
|
|
continue;
|
|
|
|
const MCSymbol *Symbol = BC.MIB->getTargetSymbol(Add);
|
|
if (!Symbol || AdrpSymbol == Symbol)
|
|
continue;
|
|
|
|
auto L = BC.scopeLock();
|
|
const int64_t Addend = BC.MIB->getTargetAddend(Add);
|
|
BC.MIB->setOperandToSymbolRef(Adrp, /*OpNum*/ 1, Symbol, Addend,
|
|
BC.Ctx.get(), ELF::R_AARCH64_NONE);
|
|
}
|
|
}
|
|
}
|
|
|
|
Error FixRelaxations::runOnFunctions(BinaryContext &BC) {
|
|
if (!BC.isAArch64() || !BC.HasRelocations)
|
|
return Error::success();
|
|
|
|
ParallelUtilities::WorkFuncTy WorkFun = [&](BinaryFunction &BF) {
|
|
runOnFunction(BF);
|
|
};
|
|
|
|
ParallelUtilities::runOnEachFunction(
|
|
BC, ParallelUtilities::SchedulingPolicy::SP_INST_LINEAR, WorkFun, nullptr,
|
|
"FixRelaxations");
|
|
return Error::success();
|
|
}
|
|
|
|
} // namespace bolt
|
|
} // namespace llvm
|