aboutsummaryrefslogtreecommitdiff
path: root/llvm/lib/MC/MCDwarf.cpp
diff options
context:
space:
mode:
authorJez Ng <jezng@fb.com>2022-06-12 10:46:49 -0400
committerJez Ng <jezng@fb.com>2022-06-12 10:47:08 -0400
commitd941d597837d9e1405086f008c9bd6a71e7263c9 (patch)
tree2dfbde4029bba612038d54446fd5eee945774928 /llvm/lib/MC/MCDwarf.cpp
parentb5d7beeb9792f626814b1a521872b611fbbaedd6 (diff)
downloadllvm-d941d597837d9e1405086f008c9bd6a71e7263c9.zip
llvm-d941d597837d9e1405086f008c9bd6a71e7263c9.tar.gz
llvm-d941d597837d9e1405086f008c9bd6a71e7263c9.tar.bz2
Revert "[MC] Omit DWARF unwind info if compact unwind is present where eligible"
This reverts commit ef501bf85d8c869248e51371f0e74bcec0e7b229.
Diffstat (limited to 'llvm/lib/MC/MCDwarf.cpp')
-rw-r--r--llvm/lib/MC/MCDwarf.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/lib/MC/MCDwarf.cpp b/llvm/lib/MC/MCDwarf.cpp
index d151b8b..6152b3e 100644
--- a/llvm/lib/MC/MCDwarf.cpp
+++ b/llvm/lib/MC/MCDwarf.cpp
@@ -1842,6 +1842,8 @@ template <> struct DenseMapInfo<CIEKey> {
void MCDwarfFrameEmitter::Emit(MCObjectStreamer &Streamer, MCAsmBackend *MAB,
bool IsEH) {
+ Streamer.generateCompactUnwindEncodings(MAB);
+
MCContext &Context = Streamer.getContext();
const MCObjectFileInfo *MOFI = Context.getObjectFileInfo();
const MCAsmInfo *AsmInfo = Context.getAsmInfo();
@@ -1851,7 +1853,6 @@ void MCDwarfFrameEmitter::Emit(MCObjectStreamer &Streamer, MCAsmBackend *MAB,
// Emit the compact unwind info if available.
bool NeedsEHFrameSection = !MOFI->getSupportsCompactUnwindWithoutEHFrame();
if (IsEH && MOFI->getCompactUnwindSection()) {
- Streamer.generateCompactUnwindEncodings(MAB);
bool SectionEmitted = false;
for (const MCDwarfFrameInfo &Frame : FrameArray) {
if (Frame.CompactUnwindEncoding == 0) continue;