[llvm] r225709 - AsmParser: Reorder ParseMetadata() logic, NFC

[Duncan P. N. Exon Smith]

Author: dexonsmith
Date: Mon Jan 12 16:24:50 2015
New Revision: 225709

URL: http://llvm.org/viewvc/llvm-project?rev=225709&view=rev
Log:
AsmParser: Reorder ParseMetadata() logic, NFC

Modified:
    llvm/trunk/lib/AsmParser/LLParser.cpp

Modified: llvm/trunk/lib/AsmParser/LLParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLParser.cpp?rev=225709&r1=225708&r2=225709&view=diff
==============================================================================
--- llvm/trunk/lib/AsmParser/LLParser.cpp (original)
+++ llvm/trunk/lib/AsmParser/LLParser.cpp Mon Jan 12 16:24:50 2015
@@ -2966,6 +2966,16 @@ bool LLParser::ParseMetadata(Metadata *&
   assert(Lex.getKind() == lltok::exclaim && "Expected '!' here");
   Lex.Lex();
 
+  // MDString:
+  //   ::= '!' STRINGCONSTANT
+  if (Lex.getKind() == lltok::StringConstant) {
+    MDString *S;
+    if (ParseMDString(S))
+      return true;
+    MD = S;
+    return false;
+  }
+
   // MDNode:
   // !{ ... }
   if (Lex.getKind() == lltok::lbrace) {
@@ -2978,20 +2988,10 @@ bool LLParser::ParseMetadata(Metadata *&
 
   // Standalone metadata reference
   // !42
-  if (Lex.getKind() == lltok::APSInt) {
-    MDNode *N;
-    if (ParseMDNodeID(N))
-      return true;
-    MD = N;
-    return false;
-  }
-
-  // MDString:
-  //   ::= '!' STRINGCONSTANT
-  MDString *S;
-  if (ParseMDString(S))
+  MDNode *N;
+  if (ParseMDNodeID(N))
     return true;
-  MD = S;
+  MD = N;
   return false;
 }