diff options
| author | Jez Ng <jezng@fb.com> | 2022-06-12 17:15:56 -0400 |
|---|---|---|
| committer | Jez Ng <jezng@fb.com> | 2022-06-12 17:24:19 -0400 |
| commit | d4bcb45db78dc7ca371224cb01bea8dcb14e0698 (patch) | |
| tree | 69b902b11a6c33ee526572764d938dabb2e3969b /llvm/lib/MC/MCObjectFileInfo.cpp | |
| parent | 775a22e32a71b1592bcc254c1cfcb037ac944aa6 (diff) | |
| download | llvm-d4bcb45db78dc7ca371224cb01bea8dcb14e0698.zip llvm-d4bcb45db78dc7ca371224cb01bea8dcb14e0698.tar.gz llvm-d4bcb45db78dc7ca371224cb01bea8dcb14e0698.tar.bz2 | |
[MC][re-land] Omit DWARF unwind info if compact unwind is present where eligible
This reverts commit d941d597837d9e1405086f008c9bd6a71e7263c9.
Differential Revision: https://reviews.llvm.org/D122258
Diffstat (limited to 'llvm/lib/MC/MCObjectFileInfo.cpp')
| -rw-r--r-- | llvm/lib/MC/MCObjectFileInfo.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/llvm/lib/MC/MCObjectFileInfo.cpp b/llvm/lib/MC/MCObjectFileInfo.cpp index 0d08976..bb39e5a 100644 --- a/llvm/lib/MC/MCObjectFileInfo.cpp +++ b/llvm/lib/MC/MCObjectFileInfo.cpp @@ -64,8 +64,18 @@ void MCObjectFileInfo::initMachOMCObjectFileInfo(const Triple &T) { (T.getArch() == Triple::aarch64 || T.getArch() == Triple::aarch64_32)) SupportsCompactUnwindWithoutEHFrame = true; - if (T.isWatchABI()) + switch (Ctx->emitDwarfUnwindInfo()) { + case EmitDwarfUnwindType::Always: + OmitDwarfIfHaveCompactUnwind = false; + break; + case EmitDwarfUnwindType::NoCompactUnwind: OmitDwarfIfHaveCompactUnwind = true; + break; + case EmitDwarfUnwindType::Default: + OmitDwarfIfHaveCompactUnwind = + T.isWatchABI() || SupportsCompactUnwindWithoutEHFrame; + break; + } FDECFIEncoding = dwarf::DW_EH_PE_pcrel; |