1 files changed, 15 insertions, 20 deletions
diff --git a/lib/Target/X86/AsmParser/X86AsmLexer.cpp b/lib/Target/X86/AsmParser/X86AsmLexer.cpp
index a58f58e033..92a1e1db7d 100644
--- a/lib/Target/X86/AsmParser/X86AsmLexer.cpp
+++ b/lib/Target/X86/AsmParser/X86AsmLexer.cpp
@@ -80,30 +80,25 @@ AsmToken X86AsmLexer::LexTokenATT() {
   case AsmToken::Error:
     SetError(Lexer->getErrLoc(), Lexer->getErr());
     return AsmToken(lexedToken);
-  case AsmToken::Percent:
-  {
+  case AsmToken::Percent:   {
     const AsmToken &nextToken = lexTentative();
-    if (nextToken.getKind() == AsmToken::Identifier) {
-      unsigned regID = MatchRegisterName(nextToken.getString());
+    if (nextToken.getKind() != AsmToken::Identifier)
+      return AsmToken(lexedToken);
+
       
-      if (regID) {
-        lexDefinite();
+    if (unsigned regID = MatchRegisterName(nextToken.getString())) {
+      lexDefinite();
         
-        StringRef regStr(lexedToken.getString().data(),
-                         lexedToken.getString().size() + 
-                         nextToken.getString().size());
-        
-        return AsmToken(AsmToken::Register, 
-                        regStr, 
-                        static_cast<int64_t>(regID));
-      }
-      else {
-        return AsmToken(lexedToken);
-      }
-    }
-    else {
-      return AsmToken(lexedToken);
+      StringRef regStr(lexedToken.getString().data(),
+                       lexedToken.getString().size() + 
+                       nextToken.getString().size());
+      
+      return AsmToken(AsmToken::Register, 
+                      regStr, 
+                      static_cast<int64_t>(regID));
     }
+    
+    return AsmToken(lexedToken);
   }    
   }
 }