[llvm-as] Fix assembling of index with multiple summaries sharing the same GUID

[evgeny777]

Summary

Currently llvm-as fails with error expected ')' here

[tejohnson]

lgtm

Looks like parsing of combined index assembly not well tested since no testing was relying on that functionality.

[thakis]

Looks like this breaks tests on Windows: http://45.33.8.238/win/6326/step_11.txt

llvm/lib/AsmParser/LLParser.cpp

if (!EatIfPresent(lltok::comma)) {
     // the symbol must have external linkage.
     AddGlobalValueToIndex(Name, GUID, GlobalValue::ExternalLinkage, ID,
                           nullptr);
     return false;
   }
 
   // Have a list of summaries
   if (ParseToken(lltok::kw_summaries, "expected 'summaries' here") ||
-      ParseToken(lltok::colon, "expected ':' here"))
+      ParseToken(lltok::colon, "expected ':' here") ||
+      ParseToken(lltok::lparen, "expected '(' here"))
     return true;
-
   do {
-    if (ParseToken(lltok::lparen, "expected '(' here"))
-      return true;
     switch (Lex.getKind()) {
     case lltok::kw_function:
       if (ParseFunctionSummary(Name, GUID, ID))
         return true;
       break;
     case lltok::kw_variable:
       if (ParseVariableSummary(Name, GUID, ID))
         return true;
       break;
     case lltok::kw_alias:
       if (ParseAliasSummary(Name, GUID, ID))
         return true;
       break;
     default:
       return Error(Lex.getLoc(), "expected summary type");
     }
-    if (ParseToken(lltok::rparen, "expected ')' here"))
-      return true;
   } while (EatIfPresent(lltok::comma));
 
-  if (ParseToken(lltok::rparen, "expected ')' here"))
+  if (ParseToken(lltok::rparen, "expected ')' here") ||
+      ParseToken(lltok::rparen, "expected ')' here"))
     return true;
 
   return false;
 }
 
 /// FunctionSummary
 ///   ::= 'function' ':' '(' 'module' ':' ModuleReference ',' GVFlags
 ///         ',' 'insts' ':' UInt32 [',' OptionalFFlags]? [',' OptionalCalls]?

llvm/test/Assembler/thinlto-multiple-summaries-for-guid.ll

+; Checks that llvm-as/llvm-dis correctly assembles/disassembles index with
+; multiple summaries with single GUID.
+; RUN: llvm-as %s -o - | llvm-dis -o - | FileCheck %s
+
+source_filename = "index.bc"
+
+^0 = module: (path: "main.bc", hash: (3499594384, 1671013073, 3271036935, 1830411232, 59290952))
+; CHECK: ^0 = module: (path: "main.bc", hash: (3499594384, 1671013073, 3271036935, 1830411232, 59290952))
+^1 = module: (path: "[Regular LTO]", hash: (0, 0, 0, 0, 0))
+; CHECK-NEXT: ^1 = module: (path: "[Regular LTO]", hash: (0, 0, 0, 0, 0))
+^2 = gv: (guid: 13351721993301222997, summaries: (function: (module: ^0, flags: (linkage: linkonce_odr, notEligibleToImport: 0, live: 1, dsoLocal: 1, canAutoHide: 1), insts: 1), function: (module: ^1, flags: (linkage: available_externally, notEligibleToImport: 1, live: 1, dsoLocal: 1, canAutoHide: 0), insts: 1)))
+; CHECK-NEXT: ^2 = gv: (guid: 13351721993301222997, summaries: (function: (module: ^0, flags: (linkage: linkonce_odr, notEligibleToImport: 0, live: 1, dsoLocal: 1, canAutoHide: 1), insts: 1), function: (module: ^1, flags: (linkage: available_externally, notEligibleToImport: 1, live: 1, dsoLocal: 1, canAutoHide: 0), insts: 1)))