From 9e9479148fcf1b22624f333484b2d0c5649b9862 Mon Sep 17 00:00:00 2001
From: "Duncan P. N. Exon Smith" <dexonsmith@apple.com>
Date: Mon, 12 Jan 2015 22:24:50 +0000
Subject: [PATCH] AsmParser: Reorder ParseMetadata() logic, NFC

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@225709 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/AsmParser/LLParser.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/AsmParser/LLParser.cpp b/lib/AsmParser/LLParser.cpp
index 5090cfb8a50..d30fccaef86 100644
--- a/lib/AsmParser/LLParser.cpp
+++ b/lib/AsmParser/LLParser.cpp
@@ -2966,6 +2966,16 @@ bool LLParser::ParseMetadata(Metadata *&MD, PerFunctionState *PFS) {
   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 *&MD, PerFunctionState *PFS) {
 
   // 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;
 }
 
-- 
2.40.0