From 451b7ea33465054093c78df349653494c6fef15b Mon Sep 17 00:00:00 2001 From: Aditya Nandakumar Date: Tue, 6 Aug 2019 17:53:04 +0000 Subject: [PATCH] [GISel]: Fix trivial build breakage git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@368067 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/CodeGen/GlobalISel/GISelKnownBits.h | 2 +- lib/CodeGen/GlobalISel/GISelKnownBits.cpp | 2 +- test/CodeGen/AArch64/O0-pipeline.ll | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/llvm/CodeGen/GlobalISel/GISelKnownBits.h b/include/llvm/CodeGen/GlobalISel/GISelKnownBits.h index d2d4595d5f7..d546c39447c 100644 --- a/include/llvm/CodeGen/GlobalISel/GISelKnownBits.h +++ b/include/llvm/CodeGen/GlobalISel/GISelKnownBits.h @@ -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, diff --git a/lib/CodeGen/GlobalISel/GISelKnownBits.cpp b/lib/CodeGen/GlobalISel/GISelKnownBits.cpp index bf316cb5dcf..12e69f8a788 100644 --- a/lib/CodeGen/GlobalISel/GISelKnownBits.cpp +++ b/lib/CodeGen/GlobalISel/GISelKnownBits.cpp @@ -260,7 +260,7 @@ void GISelKnownBits::computeKnownBitsImpl(Register R, KnownBits &Known, 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; } diff --git a/test/CodeGen/AArch64/O0-pipeline.ll b/test/CodeGen/AArch64/O0-pipeline.ll index e8f831f6151..38af1810feb 100644 --- a/test/CodeGen/AArch64/O0-pipeline.ll +++ b/test/CodeGen/AArch64/O0-pipeline.ll @@ -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 -- 2.50.1