From: Evan Cheng <evan.cheng@apple.com>
Date: Sun, 14 Oct 2007 10:09:39 +0000 (+0000)
Subject: Unbreak x86-64.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=364460156360ad2620df29fa18caab108e481754;p=oota-llvm.git

Unbreak x86-64.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@42962 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Target/X86/X86ISelLowering.cpp b/lib/Target/X86/X86ISelLowering.cpp
index 12606c3b2d3..bac658f85ec 100644
--- a/lib/Target/X86/X86ISelLowering.cpp
+++ b/lib/Target/X86/X86ISelLowering.cpp
@@ -1839,7 +1839,7 @@ X86TargetLowering::LowerX86_64CCCArguments(SDOperand Op, SelectionDAG &DAG) {
 
   ArgValues.push_back(Root);
   // Tail call convention (fastcc) needs callee pop.
-  if (CC == CallingConv::Fast && PerformTailCallOpt){
+  if (CC == CallingConv::Fast && PerformTailCallOpt) {
     BytesToPopOnReturn = StackSize;  // Callee pops everything.
     BytesCallerReserves = 0;
   } else {
@@ -1864,7 +1864,7 @@ X86TargetLowering::LowerX86_64CCCCallTo(SDOperand Op, SelectionDAG &DAG,
   // Analyze operands of the call, assigning locations to each operand.
   SmallVector<CCValAssign, 16> ArgLocs;
   CCState CCInfo(CC, isVarArg, getTargetMachine(), ArgLocs);
-  if (CC==CallingConv::Fast)
+  if (CC==CallingConv::Fast && PerformTailCallOpt)
     CCInfo.AnalyzeCallOperands(Op.Val, CC_X86_64_TailCall);
   else
     CCInfo.AnalyzeCallOperands(Op.Val, CC_X86_64_C);
@@ -1982,9 +1982,8 @@ X86TargetLowering::LowerX86_64CCCCallTo(SDOperand Op, SelectionDAG &DAG,
                       NodeTys, &Ops[0], Ops.size());
   InFlag = Chain.getValue(1);
   int NumBytesForCalleeToPush = 0;
-   if (CC==CallingConv::Fast) {
+   if (CC==CallingConv::Fast && PerformTailCallOpt) {
     NumBytesForCalleeToPush = NumBytes;  // Callee pops everything
-  
   } else {
     NumBytesForCalleeToPush = 0;  // Callee pops nothing.
   }