diff --git a/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp b/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
index 578c5140fd30b..e04c054205050 100644
--- a/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
+++ b/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
@@ -2829,6 +2829,8 @@ unsigned AArch64AsmParser::getNumRegsForRegKind(RegKind K) {
   case RegKind::SVEPredicateVector:
   case RegKind::SVEPredicateAsCounter:
     return 16;
+  case RegKind::LookupTable:
+   return 512;
   }
   llvm_unreachable("Unsupported RegKind");
 }
@@ -4344,7 +4346,7 @@ OperandMatchResultTy
 AArch64AsmParser::tryParseZTOperand(OperandVector &Operands) {
   SMLoc StartLoc = getLoc();
   const AsmToken &Tok = getTok();
-  StringRef Name = Tok.getString().lower();
+  std::string Name = Tok.getString().lower();
 
   unsigned RegNum = matchRegisterNameAlias(Name, RegKind::LookupTable);