Merging r181540:

------------------------------------------------------------------------
r181540 | void | 2013-05-09 13:10:38 -0700 (Thu, 09 May 2013) | 11 lines

Generate a compact unwind encoding in the face of a stack alignment push.

We generate a `push' of a random register (%rax) if the stack needs to be
aligned by the size of that register. However, this could mess up compact unwind
generation. In particular, we want to still generate compact unwind in the
presence of this monstrosity.

Check if the push of of the %rax/%eax register. If it is and it's marked with
the `FrameSetup' flag, then we can generate a compact unwind encoding for the
function only if the push is the last FrameSetup instruction.

------------------------------------------------------------------------


git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_33@181955 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bill Wendling 2013-05-16 00:29:29 +00:00
parent d9b720d279
commit 2fc0483faf
2 changed files with 36 additions and 0 deletions

View File

@ -534,6 +534,12 @@ uint32_t X86FrameLowering::getCompactUnwindEncoding(MachineFunction &MF) const {
// If there are too many saved registers, we cannot use compact encoding.
if (SavedRegIdx >= CU_NUM_SAVED_REGS) return CU::UNWIND_MODE_DWARF;
unsigned Reg = MI.getOperand(0).getReg();
if (Reg == (Is64Bit ? X86::RAX : X86::EAX)) {
ExpectEnd = true;
continue;
}
SavedRegs[SavedRegIdx++] = MI.getOperand(0).getReg();
StackAdjust += OffsetSize;
InstrOffset += PushInstrSize;

View File

@ -0,0 +1,30 @@
; RUN: llc < %s -disable-cfi -disable-fp-elim -mtriple x86_64-apple-darwin11 | FileCheck %s
%ty = type { i8* }
@gv = external global i32
; This is aligning the stack with a push of a random register.
; CHECK: pushq %rax
; Even though we can't encode %rax into the compact unwind, We still want to be
; able to generate a compact unwind encoding in this particular case.
;
; CHECK: __LD,__compact_unwind
; CHECK: _foo ## Range Start
; CHECK: 16842753 ## Compact Unwind Encoding: 0x1010001
define i8* @foo(i64 %size) {
%addr = alloca i64, align 8
%tmp20 = load i32* @gv, align 4
%tmp21 = call i32 @bar()
%tmp25 = load i64* %addr, align 8
%tmp26 = inttoptr i64 %tmp25 to %ty*
%tmp29 = getelementptr inbounds %ty* %tmp26, i64 0, i32 0
%tmp34 = load i8** %tmp29, align 8
%tmp35 = getelementptr inbounds i8* %tmp34, i64 %size
store i8* %tmp35, i8** %tmp29, align 8
ret i8* null
}
declare i32 @bar()