RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 20:51:52 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Differential revision: https://reviews.llvm.org/D73091
This commit is contained in:
Evgeny Leviant 2020-01-22 01:09:13 -08:00
parent 4d3808fe5f
commit 25483fac2f
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/AsmParser/LLParser.cpp
View File

@ -8040,12 +8040,10 @@ bool LLParser::ParseGVEntry(unsigned ID) {
// Have a list of summaries // Have a list of summaries
if (ParseToken(lltok::kw_summaries, "expected 'summaries' here") || 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; return true;
do { do {
if (ParseToken(lltok::lparen, "expected '(' here"))
return true;
switch (Lex.getKind()) { switch (Lex.getKind()) {
case lltok::kw_function: case lltok::kw_function:
if (ParseFunctionSummary(Name, GUID, ID)) if (ParseFunctionSummary(Name, GUID, ID))
@ -8062,11 +8060,10 @@ bool LLParser::ParseGVEntry(unsigned ID) {
default: default:
return Error(Lex.getLoc(), "expected summary type"); return Error(Lex.getLoc(), "expected summary type");
} }
if (ParseToken(lltok::rparen, "expected ')' here"))
return true;
} while (EatIfPresent(lltok::comma)); } while (EatIfPresent(lltok::comma));
if (ParseToken(lltok::rparen, "expected ')' here")) if (ParseToken(lltok::rparen, "expected ')' here") ||
ParseToken(lltok::rparen, "expected ')' here"))
return true; return true;
return false; return false;

12
test/Assembler/thinlto-multiple-summaries-for-guid.ll Normal file
View File

@ -0,0 +1,12 @@
; 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)))