[llvm] r324585 - Revert accidental changes that snuck in r324584

[Stefan Maksimovic via llvm-commits]

Author: smaksimovic
Date: Thu Feb  8 01:31:48 2018
New Revision: 324585

URL: http://llvm.org/viewvc/llvm-project?rev=324585&view=rev
Log:
Revert accidental changes that snuck in r324584

Removed:
    llvm/trunk/test/CodeGen/Mips/maxcallframesize.ll
Modified:
    llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp
    llvm/trunk/lib/Target/Mips/MipsISelLowering.h
    llvm/trunk/lib/Target/Mips/MipsRegisterInfo.cpp

Modified: llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp?rev=324585&r1=324584&r2=324585&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp Thu Feb  8 01:31:48 2018
@@ -108,11 +108,6 @@ static bool isShiftedMask(uint64_t I, ui
   return true;
 }
 
-void MipsTargetLowering::finalizeLowering(MachineFunction &MF) const {
-  MF.getFrameInfo().computeMaxCallFrameSize(MF);
-  TargetLoweringBase::finalizeLowering(MF);
-}
-
 // The MIPS MSA ABI passes vector arguments in the integer register set.
 // The number of integer registers used is dependant on the ABI used.
 MVT MipsTargetLowering::getRegisterTypeForCallingConv(MVT VT) const {

Modified: llvm/trunk/lib/Target/Mips/MipsISelLowering.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsISelLowering.h?rev=324585&r1=324584&r2=324585&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Mips/MipsISelLowering.h (original)
+++ llvm/trunk/lib/Target/Mips/MipsISelLowering.h Thu Feb  8 01:31:48 2018
@@ -370,8 +370,6 @@ class TargetRegisterClass;
     bool isJumpTableRelative() const override {
       return getTargetMachine().isPositionIndependent();
     }
-    
-    void finalizeLowering(MachineFunction &MF) const override;
 
   protected:
     SDValue getGlobalReg(SelectionDAG &DAG, EVT Ty) const;

Modified: llvm/trunk/lib/Target/Mips/MipsRegisterInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsRegisterInfo.cpp?rev=324585&r1=324584&r2=324585&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Mips/MipsRegisterInfo.cpp (original)
+++ llvm/trunk/lib/Target/Mips/MipsRegisterInfo.cpp Thu Feb  8 01:31:48 2018
@@ -74,9 +74,7 @@ MipsRegisterInfo::getRegPressureLimit(co
   case Mips::GPR64RegClassID:
   case Mips::DSPRRegClassID: {
     const TargetFrameLowering *TFI = MF.getSubtarget().getFrameLowering();
-    bool HasFP = MF.getFrameInfo().isMaxCallFrameSizeComputed()
-                 ? TFI->hasFP(MF) : true;
-    return 28 - HasFP;
+    return 28 - TFI->hasFP(MF);
   }
   case Mips::FGR32RegClassID:
     return 32;

Removed: llvm/trunk/test/CodeGen/Mips/maxcallframesize.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/maxcallframesize.ll?rev=324584&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/Mips/maxcallframesize.ll (original)
+++ llvm/trunk/test/CodeGen/Mips/maxcallframesize.ll (removed)
@@ -1,17 +0,0 @@
-; RUN: llc < %s -mtriple=mips-unknown-linux -stop-before=prologepilog | FileCheck %s
-
-; Test that maxCallFrameSize is being computed early on.
-
- at glob = external global i32*
-
-declare void @bar(i32*, [20000 x i8]* byval)
-
-define void @foo([20000 x i8]* %addr) {
-  %tmp = alloca [4 x i32], align 32
-  %tmp0 = getelementptr [4 x i32], [4 x i32]* %tmp, i32 0, i32 0
-  call void @bar(i32* %tmp0, [20000 x i8]* byval %addr)
-  ret void
-}
-
-; CHECK: adjustsStack:    true
-; CHECK: maxCallFrameSize: 20008