llvm-dwp: Include the dwo name (if available) when diagnosing duplicate CU IDs from dwp input files

If you're building dwps from other dwps, it can be hard to track down a
duplicate CU ID if it comes from two compilations of the same file in
different modes, etc. By including the .dwo path (which is hopefully
more unique than the file path) it can help track down where the
duplicates came from.

llvm-svn: 264520

4 files changed, 18 insertions, 9 deletions

diff --git a/llvm/test/tools/llvm-dwp/Inputs/duplicate_dwo_name/ac.dwp b/llvm/test/tools/llvm-dwp/Inputs/duplicate_dwo_name/ac.dwp
new file mode 100644
index 00000000000..c15412299d2
--- /dev/null
+++ b/llvm/test/tools/llvm-dwp/Inputs/duplicate_dwo_name/ac.dwp
diff --git a/llvm/test/tools/llvm-dwp/Inputs/duplicate_dwo_name/bc.dwp b/llvm/test/tools/llvm-dwp/Inputs/duplicate_dwo_name/bc.dwp
new file mode 100644
index 00000000000..674f6fa7f72
--- /dev/null
+++ b/llvm/test/tools/llvm-dwp/Inputs/duplicate_dwo_name/bc.dwp
diff --git a/llvm/test/tools/llvm-dwp/Inputs/duplicate_dwo_name/c.dwo b/llvm/test/tools/llvm-dwp/Inputs/duplicate_dwo_name/c.dwo
new file mode 100644
index 00000000000..9fa811d0a9f
--- /dev/null
+++ b/llvm/test/tools/llvm-dwp/Inputs/duplicate_dwo_name/c.dwo
diff --git a/llvm/test/tools/llvm-dwp/X86/duplicate.test b/llvm/test/tools/llvm-dwp/X86/duplicate.test
index 1330cf37fed..67b68294789 100644
--- a/llvm/test/tools/llvm-dwp/X86/duplicate.test
+++ b/llvm/test/tools/llvm-dwp/X86/duplicate.test
@@ -1,18 +1,27 @@
 RUN: not llvm-dwp %p/../Inputs/duplicate/c.dwo %p/../Inputs/duplicate/c.dwo -o %t 2>&1 \
-RUN:   | FileCheck --check-prefix=CHECK %s
+RUN:   | FileCheck --check-prefix=DWOS %s
 
 RUN: not llvm-dwp %p/../Inputs/duplicate/c.dwo %p/../Inputs/duplicate/bc.dwp -o %t 2>&1 \
-RUN:   | FileCheck --check-prefix=CHECK --check-prefix=DWP2 %s
+RUN:   | FileCheck --check-prefix=2DWP %s
 
 RUN: not llvm-dwp %p/../Inputs/duplicate/ac.dwp %p/../Inputs/duplicate/c.dwo -o %t 2>&1 \
-RUN:   | FileCheck --check-prefix=CHECK --check-prefix=DWP1 %s
+RUN:   | FileCheck --check-prefix=1DWP %s
 
-RUN: not llvm-dwp %p/../Inputs/duplicate/ac.dwp %p/../Inputs/duplicate/bc.dwp -o %t 2>&1 \
-RUN:   | FileCheck --check-prefix=CHECK --check-prefix=DWP1 --check-prefix=DWP2 %s
+RUN: not llvm-dwp %p/../Inputs/duplicate_dwo_name/c.dwo %p/../Inputs/duplicate_dwo_name/c.dwo -o %t 2>&1 \
+RUN:   | FileCheck --check-prefix=DWODWOS %s
+
+RUN: not llvm-dwp %p/../Inputs/duplicate_dwo_name/c.dwo %p/../Inputs/duplicate_dwo_name/bc.dwp -o %t 2>&1 \
+RUN:   | FileCheck --check-prefix=DWO2DWP %s
+
+RUN: not llvm-dwp %p/../Inputs/duplicate_dwo_name/ac.dwp %p/../Inputs/duplicate_dwo_name/c.dwo -o %t 2>&1 \
+RUN:   | FileCheck --check-prefix=DWO1DWP %s
 
 Build from a, b, and c.c all containing a single void() func by the name of the file.
 
-CHECK: Duplicate DWO ID ({{.*}}) in 'c.c'
-DWP1-SAME: (from '{{.*}}ac.dwp')
-CHECK-SAME: and 'c.c'
-DWP2-SAME: (from '{{.*}}bc.dwp')
+DWOS: Duplicate DWO ID ({{.*}}) in 'c.c' and 'c.c'{{$}}
+1DWP: Duplicate DWO ID ({{.*}}) in 'c.c' (from '{{.*}}ac.dwp') and 'c.c'{{$}}
+2DWP: Duplicate DWO ID ({{.*}}) in 'c.c' and 'c.c' (from '{{.*}}bc.dwp'){{$}}
+
+DWODWOS: Duplicate DWO ID ({{.*}}) in 'c.c' and 'c.c'{{$}}
+DWO1DWP: Duplicate DWO ID ({{.*}}) in 'c.c' (from 'c.dwo' in '{{.*}}ac.dwp') and 'c.c'{{$}}
+DWO2DWP: Duplicate DWO ID ({{.*}}) in 'c.c' and 'c.c' (from 'c.dwo' in '{{.*}}bc.dwp'){{$}}