
Follow-up to #140494 `shouldForceRelocation` is conservative and produces redundant relocations. For example, RISCVAsmBackend::ForceRelocs (introduced to support mixed relax/norelax code) leads to redundant relocations in the following example adapted from #77436 ``` .option norelax j label // For assembly input, RISCVAsmParser::ParseInstruction sets ForceRelocs (https://reviews.llvm.org/D46423). // For direct object emission, RISCVELFStreamer sets ForceRelocs (#77436) .option relax call foo // linker-relaxable .option norelax j label // redundant relocation due to ForceRelocs .option relax label: ``` Root problem: The `isSymbolRefDifferenceFullyResolvedImpl` condition in MCAssembler::evaluateFixup does not check whether two locations are separated by a fragment whose size can be indeterminate due to linker instruction (e.g. MCDataFragment with relaxation, or MCAlignFragment due to indeterminate start offst). This patch * Updates the fragment walk code in `attemptToFoldSymbolOffsetDifference` to treat MCRelaxableFragment (for --riscv-asm-relax-branches) as fixed size after finishLayout. * Adds a condition in `addReloc` to complement `isSymbolRefDifferenceFullyResolvedImpl`. * Removes the no longer needed `shouldForceRelocation`. This fragment walk code path handles nicely handles mixed relax/norelax case from https://discourse.llvm.org/t/possible-problem-related-to-subtarget-usage/75283 and allows us to remove `MCSubtargetInfo` argument (#73721) as a follow-up. This fragment walk code should be avoided in the absence of linker-relaxable fragments within the current section. Adjust two bolt/test/RISCV tests (#141310) Pull Request: https://github.com/llvm/llvm-project/pull/140692
87 lines
2.6 KiB
C++
87 lines
2.6 KiB
C++
//===- lib/MC/MCSection.cpp - Machine Code Section Representation ---------===//
|
|
//
|
|
// 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 "llvm/MC/MCSection.h"
|
|
#include "llvm/ADT/SmallVector.h"
|
|
#include "llvm/Config/llvm-config.h"
|
|
#include "llvm/MC/MCContext.h"
|
|
#include "llvm/MC/MCFragment.h"
|
|
#include "llvm/MC/MCSymbol.h"
|
|
#include "llvm/Support/Compiler.h"
|
|
#include "llvm/Support/ErrorHandling.h"
|
|
#include "llvm/Support/raw_ostream.h"
|
|
#include <utility>
|
|
|
|
using namespace llvm;
|
|
|
|
MCSection::MCSection(SectionVariant V, StringRef Name, bool IsText,
|
|
bool IsVirtual, MCSymbol *Begin)
|
|
: Begin(Begin), BundleGroupBeforeFirstInst(false), HasInstructions(false),
|
|
HasLayout(false), IsRegistered(false), IsText(IsText),
|
|
IsVirtual(IsVirtual), LinkerRelaxable(false), Name(Name), Variant(V) {
|
|
DummyFragment.setParent(this);
|
|
// The initial subsection number is 0. Create a fragment list.
|
|
CurFragList = &Subsections.emplace_back(0u, FragList{}).second;
|
|
}
|
|
|
|
MCSymbol *MCSection::getEndSymbol(MCContext &Ctx) {
|
|
if (!End)
|
|
End = Ctx.createTempSymbol("sec_end");
|
|
return End;
|
|
}
|
|
|
|
bool MCSection::hasEnded() const { return End && End->isInSection(); }
|
|
|
|
MCSection::~MCSection() {
|
|
for (auto &[_, Chain] : Subsections) {
|
|
for (MCFragment *X = Chain.Head, *Y; X; X = Y) {
|
|
Y = X->Next;
|
|
X->destroy();
|
|
}
|
|
}
|
|
}
|
|
|
|
void MCSection::setBundleLockState(BundleLockStateType NewState) {
|
|
if (NewState == NotBundleLocked) {
|
|
if (BundleLockNestingDepth == 0) {
|
|
report_fatal_error("Mismatched bundle_lock/unlock directives");
|
|
}
|
|
if (--BundleLockNestingDepth == 0) {
|
|
BundleLockState = NotBundleLocked;
|
|
}
|
|
return;
|
|
}
|
|
|
|
// If any of the directives is an align_to_end directive, the whole nested
|
|
// group is align_to_end. So don't downgrade from align_to_end to just locked.
|
|
if (BundleLockState != BundleLockedAlignToEnd) {
|
|
BundleLockState = NewState;
|
|
}
|
|
++BundleLockNestingDepth;
|
|
}
|
|
|
|
StringRef MCSection::getVirtualSectionKind() const { return "virtual"; }
|
|
|
|
#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
|
|
LLVM_DUMP_METHOD void MCSection::dump() const {
|
|
raw_ostream &OS = errs();
|
|
|
|
OS << "<MCSection Name:" << getName();
|
|
OS << " Fragments:[\n ";
|
|
bool First = true;
|
|
for (auto &F : *this) {
|
|
if (First)
|
|
First = false;
|
|
else
|
|
OS << ",\n ";
|
|
F.dump();
|
|
}
|
|
OS << "]>";
|
|
}
|
|
#endif
|