[llvm] r368067 - [GISel]: Fix trivial build breakage

[Aditya Nandakumar via llvm-commits]

Author: aditya_nandakumar
Date: Tue Aug  6 10:53:04 2019
New Revision: 368067

URL: http://llvm.org/viewvc/llvm-project?rev=368067&view=rev
Log:
[GISel]: Fix trivial build breakage

Modified:
    llvm/trunk/include/llvm/CodeGen/GlobalISel/GISelKnownBits.h
    llvm/trunk/lib/CodeGen/GlobalISel/GISelKnownBits.cpp
    llvm/trunk/test/CodeGen/AArch64/O0-pipeline.ll

Modified: llvm/trunk/include/llvm/CodeGen/GlobalISel/GISelKnownBits.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/GlobalISel/GISelKnownBits.h?rev=368067&r1=368066&r2=368067&view=diff
==============================================================================
--- llvm/trunk/include/llvm/CodeGen/GlobalISel/GISelKnownBits.h (original)
+++ llvm/trunk/include/llvm/CodeGen/GlobalISel/GISelKnownBits.h Tue Aug  6 10:53:04 2019
@@ -66,7 +66,7 @@ public:
   void changedInstr(MachineInstr &MI) override{};
 
 protected:
-  constexpr unsigned getMaxDepth() const { return 6; }
+  unsigned getMaxDepth() const { return 6; }
 };
 
 /// To use KnownBitsInfo analysis in a pass,

Modified: llvm/trunk/lib/CodeGen/GlobalISel/GISelKnownBits.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/GlobalISel/GISelKnownBits.cpp?rev=368067&r1=368066&r2=368067&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/GlobalISel/GISelKnownBits.cpp (original)
+++ llvm/trunk/lib/CodeGen/GlobalISel/GISelKnownBits.cpp Tue Aug  6 10:53:04 2019
@@ -260,7 +260,7 @@ void GISelKnownBits::computeKnownBitsImp
                          Depth + 1);
     if (!RHSKnown.isConstant()) {
       LLVM_DEBUG(
-          MachineInstr *RHSMI = MRI->getVRegDef(MI.getOperand(2).getReg());
+          MachineInstr *RHSMI = MRI.getVRegDef(MI.getOperand(2).getReg());
           dbgs() << '[' << Depth << "] Shift not known constant: " << *RHSMI);
       break;
     }

Modified: llvm/trunk/test/CodeGen/AArch64/O0-pipeline.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AArch64/O0-pipeline.ll?rev=368067&r1=368066&r2=368067&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/AArch64/O0-pipeline.ll (original)
+++ llvm/trunk/test/CodeGen/AArch64/O0-pipeline.ll Tue Aug  6 10:53:04 2019
@@ -35,6 +35,7 @@
 ; CHECK-NEXT:       Module Verifier
 ; CHECK-NEXT:       Analysis containing CSE Info
 ; CHECK-NEXT:       IRTranslator
+; CHECK-NEXT:       Analysis for ComputingKnownBits
 ; CHECK-NEXT:       AArch64PreLegalizerCombiner
 ; CHECK-NEXT:       Analysis containing CSE Info
 ; CHECK-NEXT:       Legalizer