[PATCH] D61880: [IRMover] Improve diagnostic messages for conflicting metadata
Igor Kudrin via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Mon May 13 22:15:51 PDT 2019
ikudrin created this revision.
ikudrin added reviewers: dblaikie, kristina, pcc, tejohnson.
Herald added subscribers: dexonsmith, mehdi_amini.
Herald added a project: LLVM.
This does the similar for error messages as D52952 <https://reviews.llvm.org/D52952> 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.
Repository:
rL LLVM
https://reviews.llvm.org/D61880
Files:
lib/Linker/IRMover.cpp
test/Linker/module-flags-5-a.ll
test/Linker/module-flags-6-a.ll
test/Linker/module-flags-7-a.ll
Index: test/Linker/module-flags-7-a.ll
===================================================================
--- test/Linker/module-flags-7-a.ll
+++ test/Linker/module-flags-7-a.ll
@@ -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 }
Index: test/Linker/module-flags-6-a.ll
===================================================================
--- test/Linker/module-flags-6-a.ll
+++ test/Linker/module-flags-6-a.ll
@@ -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 }
Index: test/Linker/module-flags-5-a.ll
===================================================================
--- test/Linker/module-flags-5-a.ll
+++ test/Linker/module-flags-5-a.ll
@@ -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 }
Index: lib/Linker/IRMover.cpp
===================================================================
--- lib/Linker/IRMover.cpp
+++ lib/Linker/IRMover.cpp
@@ -1223,7 +1223,9 @@
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 @@
// 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 @@
// 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: {
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D61880.199363.patch
Type: text/x-patch
Size: 3195 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190514/c0773457/attachment.bin>
More information about the llvm-commits
mailing list