diff options
| author | Fangrui Song <i@maskray.me> | 2025-07-20 00:46:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-20 00:46:51 -0700 |
| commit | 2ba5e0ad1789f33c71af15d7c09cc5ca874cf7b1 (patch) | |
| tree | 14ac61eaee7ec4f661c35ae9bdbcdd14004506eb /llvm/lib/MC/MCExpr.cpp | |
| parent | 5ee34ff1e5cc952116f0da943ddaeb1a71db2940 (diff) | |
| download | llvm-2ba5e0ad1789f33c71af15d7c09cc5ca874cf7b1.zip llvm-2ba5e0ad1789f33c71af15d7c09cc5ca874cf7b1.tar.gz llvm-2ba5e0ad1789f33c71af15d7c09cc5ca874cf7b1.tar.bz2 | |
MC: Encode FT_Align in fragment's variable-size tail
Follow-up to #148544
Pull Request: https://github.com/llvm/llvm-project/pull/149030
Diffstat (limited to 'llvm/lib/MC/MCExpr.cpp')
| -rw-r--r-- | llvm/lib/MC/MCExpr.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/llvm/lib/MC/MCExpr.cpp b/llvm/lib/MC/MCExpr.cpp index 22dff49..f0f1bd4 100644 --- a/llvm/lib/MC/MCExpr.cpp +++ b/llvm/lib/MC/MCExpr.cpp @@ -379,11 +379,11 @@ static void attemptToFoldSymbolOffsetDifference(const MCAssembler *Asm, // After layout, during relocation generation, it can be treated as a // data fragment. Displacement += F->getSize(); - } else if (auto *AF = dyn_cast<MCAlignFragment>(F); - AF && Layout && AF->hasEmitNops() && + } else if (F->getKind() == MCFragment::FT_Align && Layout && + F->hasAlignEmitNops() && !Asm->getBackend().shouldInsertExtraNopBytesForCodeAlign( - *AF, Count)) { - Displacement += Asm->computeFragmentSize(*AF); + *F, Count)) { + Displacement += Asm->computeFragmentSize(*F); } else if (auto *FF = dyn_cast<MCFillFragment>(F); FF && FF->getNumValues().evaluateAsAbsolute(Num)) { Displacement += Num * FF->getValueSize(); |