1 files changed, 8 insertions, 4 deletions
diff --git a/llvm/lib/Target/AArch64/AArch64Subtarget.cpp b/llvm/lib/Target/AArch64/AArch64Subtarget.cpp
index f2c4569c553..72c16638cc6 100644
--- a/llvm/lib/Target/AArch64/AArch64Subtarget.cpp
+++ b/llvm/lib/Target/AArch64/AArch64Subtarget.cpp
@@ -57,12 +57,16 @@ AArch64Subtarget::AArch64Subtarget(const Triple &TT, const std::string &CPU,
       StrictAlign(false), ReserveX18(TT.isOSDarwin()), IsLittle(LittleEndian),
       CPUString(CPU), TargetTriple(TT), FrameLowering(),
       InstrInfo(initializeSubtargetDependencies(FS)), TSInfo(),
-      TLInfo(TM, *this), CallLoweringInfo(nullptr) {}
+      TLInfo(TM, *this), GISelAccessor() {}
 
 const CallLowering *AArch64Subtarget::getCallLowering() const {
-  if (!CallLoweringInfo)
-    CallLoweringInfo.reset(new AArch64CallLowering(TLInfo));
-  return CallLoweringInfo.get();
+  assert(GISelAccessor && "Access to GlobalISel APIs not set");
+  return GISelAccessor->getCallLowering();
+}
+
+const RegisterBankInfo *AArch64Subtarget::getRegBankInfo() const {
+  assert(GISelAccessor && "Access to GlobalISel APIs not set");
+  return GISelAccessor->getRegBankInfo();
 }
 
 /// ClassifyGlobalReference - Find the target operand flags that describe