From 6bbfde5c48aa0a21d2a303341bb9824cead22728 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 llvm-svn: 368067 --- llvm/include/llvm/CodeGen/GlobalISel/GISelKnownBits.h | 2 +- llvm/lib/CodeGen/GlobalISel/GISelKnownBits.cpp | 2 +- llvm/test/CodeGen/AArch64/O0-pipeline.ll | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/llvm/include/llvm/CodeGen/GlobalISel/GISelKnownBits.h b/llvm/include/llvm/CodeGen/GlobalISel/GISelKnownBits.h index d2d4595..d546c39 100644 --- a/llvm/include/llvm/CodeGen/GlobalISel/GISelKnownBits.h +++ b/llvm/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/llvm/lib/CodeGen/GlobalISel/GISelKnownBits.cpp b/llvm/lib/CodeGen/GlobalISel/GISelKnownBits.cpp index bf316cb..12e69f8 100644 --- a/llvm/lib/CodeGen/GlobalISel/GISelKnownBits.cpp +++ b/llvm/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/llvm/test/CodeGen/AArch64/O0-pipeline.ll b/llvm/test/CodeGen/AArch64/O0-pipeline.ll index e8f831f..38af181 100644 --- a/llvm/test/CodeGen/AArch64/O0-pipeline.ll +++ b/llvm/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.7.4