Index: lib/Target/Mips/AsmParser/MipsAsmParser.cpp
===================================================================
--- lib/Target/Mips/AsmParser/MipsAsmParser.cpp
+++ lib/Target/Mips/AsmParser/MipsAsmParser.cpp
@@ -46,13 +46,13 @@
     ATReg(1), Reorder(true), Macro(true), Features(Features_) {}
 
   MipsAssemblerOptions(const MipsAssemblerOptions *Opts) {
-    ATReg = Opts->getATRegNum();
+    ATReg = Opts->getATReg();
     Reorder = Opts->isReorder();
     Macro = Opts->isMacro();
     Features = Opts->getFeatures();
   }
 
-  unsigned getATRegNum() const { return ATReg; }
+  unsigned getATReg() const { return ATReg; }
   bool setATReg(unsigned Reg);
 
   bool isReorder() const { return Reorder; }
@@ -2048,7 +2048,7 @@
     if (!isATAvailable(IDLoc))
       return;
 
-    unsigned AT = AssemblerOptions.back()->getATRegNum();
+    unsigned AT = AssemblerOptions.back()->getATReg();
     TmpRegNum = getReg(
         (isGP64bit()) ? Mips::GPR64RegClassID : Mips::GPR32RegClassID, AT);
   }
@@ -2199,7 +2199,7 @@
 
 bool MipsAsmParser::isATAvailable(SMLoc IDLoc) {
   // If AT is not available, give an error.
-  if (AssemblerOptions.back()->getATRegNum() == 0) {
+  if (AssemblerOptions.back()->getATReg() == 0) {
     reportParseError(
         IDLoc, "pseudo-instruction requires $at, which is not available");
     return false;
@@ -2209,7 +2209,7 @@
 
 void MipsAsmParser::warnIfAssemblerTemporary(int RegIndex, SMLoc Loc) {
   if ((RegIndex != 0) && 
-      ((int)AssemblerOptions.back()->getATRegNum() == RegIndex)) {
+      ((int)AssemblerOptions.back()->getATReg() == RegIndex)) {
     if (RegIndex == 1)
       Warning(Loc, "used $at without \".set noat\"");
     else