Push a dependent computation into the assert that uses it; NFC

... instead of explicitly conditioning on NDEBUG.  Also use an easier to
read conditional expression.

(Addresses post-commit review from David Blaikie.)

llvm-svn: 272762

1 files changed, 3 insertions, 5 deletions

diff --git a/llvm/lib/Target/X86/X86FrameLowering.cpp b/llvm/lib/Target/X86/X86FrameLowering.cpp
index 043e833bc78..2be00ca1707 100644
--- a/llvm/lib/Target/X86/X86FrameLowering.cpp
+++ b/llvm/lib/Target/X86/X86FrameLowering.cpp
@@ -1773,12 +1773,10 @@ X86FrameLowering::getFrameIndexReferenceFromSP(const MachineFunction &MF,
   const TargetFrameLowering *TFI = MF.getSubtarget().getFrameLowering();
   if (!AllowSPAdjustment && !TFI->hasReservedCallFrame(MF))
     return None;
-#ifndef NDEBUG
+
   // We don't handle tail calls, and shouldn't be seeing them either.
-  int TailCallReturnAddrDelta =
-      MF.getInfo<X86MachineFunctionInfo>()->getTCReturnAddrDelta();
-  assert(!(TailCallReturnAddrDelta < 0) && "we don't handle this case!");
-#endif
+  assert(MF.getInfo<X86MachineFunctionInfo>()->getTCReturnAddrDelta() >= 0 &&
+         "we don't handle this case!");
 
   // Fill in FrameReg output argument.
   FrameReg = TRI->getStackRegister();