This is an archive of the discontinued LLVM Phabricator instance.

Differential D155988

Enable compact unwind in all darwin simulators
ClosedPublic

Authored by jroelofs on Jul 21 2023, 12:55 PM.

Details

Reviewers
pete
Commits
rG62a1fbe9f7f9: Enable compact unwind in all darwin simulators
Summary

... since they've always supported it.

rdar://104359594

Diff Detail

Event Timeline

jroelofs created this revision.Jul 21 2023, 12:55 PM
Herald added a project: Restricted Project. · View Herald TranscriptJul 21 2023, 12:55 PM
Herald added subscribers: pengfei, hiraditya. · View Herald Transcript
jroelofs requested review of this revision.Jul 21 2023, 12:55 PM
Herald added a project: Restricted Project. · View Herald TranscriptJul 21 2023, 12:55 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
pete accepted this revision.Jul 21 2023, 1:59 PM

LGTM

This revision is now accepted and ready to land.Jul 21 2023, 1:59 PM
This revision was landed with ongoing or failed builds.Jul 21 2023, 4:14 PM
Closed by commit rG62a1fbe9f7f9: Enable compact unwind in all darwin simulators (authored by jroelofs). · Explain Why
This revision was automatically updated to reflect the committed changes.
jroelofs added a commit: rG62a1fbe9f7f9: Enable compact unwind in all darwin simulators.
Harbormaster completed remote builds in B247299: Diff 543029.Jul 21 2023, 6:07 PM

Revision Contents

PathSize
llvm/
lib/
MC/
7 lines
test/
CodeGen/
X86/
30 lines

Diff 543110

llvm/lib/MC/MCObjectFileInfo.cpp

Show First 20 Lines • Show All 42 Lines • ▼ Show 20 Linesstatic bool useCompactUnwind(const Triple &T) {
// Use it on newer version of OS X. // Use it on newer version of OS X.
if (T.isMacOSX() && !T.isMacOSXVersionLT(10, 6)) if (T.isMacOSX() && !T.isMacOSXVersionLT(10, 6))
return true; return true;
// And the iOS simulator. // And the iOS simulator.
if (T.isiOS() && T.isX86()) if (T.isiOS() && T.isX86())
return true; return true;
// The rest of the simulators always have it.
if (T.isSimulatorEnvironment())
return true;
return false; return false;
} }
void MCObjectFileInfo::initMachOMCObjectFileInfo(const Triple &T) { void MCObjectFileInfo::initMachOMCObjectFileInfo(const Triple &T) {
// MachO // MachO
SupportsWeakOmittedEHFrame = false; SupportsWeakOmittedEHFrame = false;
EHFrameSection = Ctx->getMachOSection( EHFrameSection = Ctx->getMachOSection(
"__TEXT", "__eh_frame", "__TEXT", "__eh_frame",
MachO::S_COALESCED | MachO::S_ATTR_NO_TOC | MachO::S_COALESCED | MachO::S_ATTR_NO_TOC |
MachO::S_ATTR_STRIP_STATIC_SYMS | MachO::S_ATTR_LIVE_SUPPORT, MachO::S_ATTR_STRIP_STATIC_SYMS | MachO::S_ATTR_LIVE_SUPPORT,
SectionKind::getReadOnly()); SectionKind::getReadOnly());
if (T.isOSDarwin() && if (T.isOSDarwin() &&
(T.getArch() == Triple::aarch64 || T.getArch() == Triple::aarch64_32)) (T.getArch() == Triple::aarch64 || T.getArch() == Triple::aarch64_32 ||
T.isSimulatorEnvironment()))
SupportsCompactUnwindWithoutEHFrame = true; SupportsCompactUnwindWithoutEHFrame = true;
switch (Ctx->emitDwarfUnwindInfo()) { switch (Ctx->emitDwarfUnwindInfo()) {
case EmitDwarfUnwindType::Always: case EmitDwarfUnwindType::Always:
OmitDwarfIfHaveCompactUnwind = false; OmitDwarfIfHaveCompactUnwind = false;
break; break;
case EmitDwarfUnwindType::NoCompactUnwind: case EmitDwarfUnwindType::NoCompactUnwind:
OmitDwarfIfHaveCompactUnwind = true; OmitDwarfIfHaveCompactUnwind = true;
▲ Show 20 Lines • Show All 1,161 Lines • Show Last 20 Lines

llvm/test/CodeGen/X86/apple-simulator-compact-unwind.ll

  • This file was added.
; RUN: llc -mtriple x86_64-apple-ios-simulator -filetype=obj -o - %s | \
; RUN: llvm-objdump --macho --unwind-info - | \
; RUN: FileCheck %s
; RUN: llc -mtriple x86_64-apple-ios -filetype=obj -o - %s | \
; RUN: llvm-objdump --macho --unwind-info - | \
; RUN: FileCheck %s
target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
; Function Attrs: noinline nounwind optnone ssp uwtable
define i32 @rdar104359594() #0 {
entry:
ret i32 0
}
attributes #0 = { noinline nounwind optnone ssp uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-builtin-calloc" "no-builtin-stpcpy" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="core2" "target-features"="+cmov,+cx16,+cx8,+fxsr,+mmx,+sahf,+sse,+sse2,+sse3,+ssse3,+x87" "tune-cpu"="generic" }
!llvm.module.flags = !{!0, !1, !2, !3}
!llvm.ident = !{!4}
!0 = !{i32 1, !"wchar_size", i32 4}
!1 = !{i32 8, !"PIC Level", i32 2}
!2 = !{i32 7, !"uwtable", i32 2}
!3 = !{i32 7, !"frame-pointer", i32 2}
!4 = !{!"clang"}
; Check that we generate compact unwind for simulators, which have always
; supported it.
; CHECK: Contents of __compact_unwind section: