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

[IRMover] Improve diagnostic messages for conflicting metadata

Browse Source 
This does the similar for error messages as rL344011 has done for warnings.

With llvm::lto::LTO, the error might appear when LTO::run() is executed.
In that case, the calling code cannot know which module causes the error
and, subsequently, cannot hint the user.

Differential Revision: https://reviews.llvm.org/D61880

llvm-svn: 360857
This commit is contained in:
Igor Kudrin 2019-05-16 05:23:13 +00:00
parent c12f7508a5
commit f174188313
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Linker/IRMover.cpp
View File

@ -1223,7 +1223,9 @@ Error IRLinker::linkModuleFlagsMetadata() {
if (SrcBehaviorValue == Module::Override &&
SrcOp->getOperand(2) != DstOp->getOperand(2))
return stringErr("linking module flags '" + ID->getString() +
"': IDs have conflicting override values");
"': IDs have conflicting override values in '" +
SrcM->getModuleIdentifier() + "' and '" +
DstM.getModuleIdentifier() + "'");
continue;
} else if (SrcBehaviorValue == Module::Override) {
// Update the destination flag to that of the source.
@ -1234,7 +1236,9 @@ Error IRLinker::linkModuleFlagsMetadata() {
// Diagnose inconsistent merge behavior types.
if (SrcBehaviorValue != DstBehaviorValue)
return stringErr("linking module flags '" + ID->getString() +
"': IDs have conflicting behaviors");
"': IDs have conflicting behaviors in '" +
SrcM->getModuleIdentifier() + "' and '" +
DstM.getModuleIdentifier() + "'");
auto replaceDstValue = [&](MDNode *New) {
Metadata *FlagOps[] = {DstOp->getOperand(0), ID, New};
@ -1252,7 +1256,9 @@ Error IRLinker::linkModuleFlagsMetadata() {
// Emit an error if the values differ.
if (SrcOp->getOperand(2) != DstOp->getOperand(2))
return stringErr("linking module flags '" + ID->getString() +
"': IDs have conflicting values");
"': IDs have conflicting values in '" +
SrcM->getModuleIdentifier() + "' and '" +
DstM.getModuleIdentifier() + "'");
continue;
}
case Module::Warning: {

2
test/Linker/module-flags-5-a.ll
View File

@ -2,7 +2,7 @@
; Test the 'override' error.
; CHECK: linking module flags 'foo': IDs have conflicting override values
; CHECK: linking module flags 'foo': IDs have conflicting override values in '{{.*}}module-flags-5-b.ll' and 'llvm-link'
!0 = !{ i32 4, !"foo", i32 927 }

2
test/Linker/module-flags-6-a.ll
View File

@ -2,7 +2,7 @@
; Test module flags error messages.
; CHECK: linking module flags 'foo': IDs have conflicting values
; CHECK: linking module flags 'foo': IDs have conflicting values in '{{.*}}module-flags-6-b.ll' and 'llvm-link'
!0 = !{ i32 1, !"foo", i32 37 }

2
test/Linker/module-flags-7-a.ll
View File

@ -2,7 +2,7 @@
; Test module flags error messages.
; CHECK: linking module flags 'foo': IDs have conflicting behaviors
; CHECK: linking module flags 'foo': IDs have conflicting behaviors in '{{.*}}module-flags-7-b.ll' and 'llvm-link'
!0 = !{ i32 1, !"foo", i32 37 }