[llvm-branch-commits] [llvm-branch] r84576 - in /llvm/branches/Apple/Leela: lib/AsmParser/LLParser.cpp test/DebugInfo/2009-11-16-Phi.ll

[Bill Wendling]

Author: void
Date: Mon Oct 19 19:43:55 2009
New Revision: 84576

URL: http://llvm.org/viewvc/llvm-project?rev=84576&view=rev
Log:
$ svn merge -c 84264 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r84264 into '.':
A    test/DebugInfo/2009-11-16-Phi.ll
U    lib/AsmParser/LLParser.cpp


Added:
    llvm/branches/Apple/Leela/test/DebugInfo/2009-11-16-Phi.ll
      - copied unchanged from r84264, llvm/trunk/test/DebugInfo/2009-11-16-Phi.ll
Modified:
    llvm/branches/Apple/Leela/lib/AsmParser/LLParser.cpp

Modified: llvm/branches/Apple/Leela/lib/AsmParser/LLParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/AsmParser/LLParser.cpp?rev=84576&r1=84575&r2=84576&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/lib/AsmParser/LLParser.cpp (original)
+++ llvm/branches/Apple/Leela/lib/AsmParser/LLParser.cpp Mon Oct 19 19:43:55 2009
@@ -3314,6 +3314,9 @@
     if (!EatIfPresent(lltok::comma))
       break;
 
+    if (Lex.getKind() == lltok::NamedOrCustomMD)
+      break;
+
     if (ParseToken(lltok::lsquare, "expected '[' in phi value list") ||
         ParseValue(Ty, Op0, PFS) ||
         ParseToken(lltok::comma, "expected ',' after insertelement value") ||
@@ -3322,6 +3325,9 @@
       return true;
   }
 
+  if (Lex.getKind() == lltok::NamedOrCustomMD)
+    if (ParseOptionalCustomMetadata()) return true;
+
   if (!Ty->isFirstClassType())
     return Error(TypeLoc, "phi node must have first class type");