[llvm-commits] [llvm] r138826 - /llvm/trunk/lib/Target/X86/X86FrameLowering.cpp

[Benjamin Kramer]

On Tue, Aug 30, 2011 at 13:54, Bill Wendling <isanbard at gmail.com> wrote:
> Author: void
> Date: Tue Aug 30 15:54:11 2011
> New Revision: 138826
>
> URL: http://llvm.org/viewvc/llvm-project?rev=138826&view=rev
> Log:
> Enable compact unwind info by default. This only applies to Darwin when CFI is
> disabled.
>
> Modified:
>    llvm/trunk/lib/Target/X86/X86FrameLowering.cpp
>
> Modified: llvm/trunk/lib/Target/X86/X86FrameLowering.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86FrameLowering.cpp?rev=138826&r1=138825&r2=138826&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/X86/X86FrameLowering.cpp (original)
> +++ llvm/trunk/lib/Target/X86/X86FrameLowering.cpp Tue Aug 30 15:54:11 2011
> @@ -35,13 +35,6 @@
>  // FIXME: completely move here.
>  extern cl::opt<bool> ForceStackAlign;
>
> -// FIXME: Remove once linker support is available. The feature exists only on
> -// Darwin at the moment.
> -static cl::opt<bool>
> -GenerateCompactUnwind("gen-compact-unwind",
> -                      cl::desc("Generate compact unwind encoding"),
> -                      cl::Hidden);
> -
>  bool X86FrameLowering::hasReservedCallFrame(const MachineFunction &MF) const {
>   return !MF.getFrameInfo()->hasVarSizedObjects();
>  }
> @@ -908,8 +901,7 @@
>   }
>
>   // Darwin 10.7 and greater has support for compact unwind encoding.
> -  if (GenerateCompactUnwind &&
> -      STI.isTargetDarwin() && !STI.getTargetTriple().isMacOSXVersionLT(10, 6))
> +  if (STI.isTargetDarwin() && !STI.getTargetTriple().isMacOSXVersionLT(10, 6))
>     MMI.setCompactUnwindEncoding(getCompactUnwindEncoding(MF));
>  }

The comment says 10.6 doesn't support compact unwinding but the code
says it does?

- Ben