IR: Use an explicit map for debug info type uniquing

Rather than relying on the structural equivalence of DICompositeType to
merge type definitions, use an explicit map on the LLVMContext that
LLParser and BitcodeReader consult when constructing new nodes.
Each non-forward-declaration DICompositeType with a non-empty
'identifier:' field is stored/loaded from the type map, and the first
definiton will "win".

This map is opt-in: clients that expect ODR types from different modules
to be merged must call LLVMContext::ensureDITypeMap.

  - Clients that just happen to load more than one Module in the same
    LLVMContext won't magically merge types.

  - Clients (like LTO) that want to continue to merge types based on ODR
    identifiers should opt-in immediately.

I have updated LTOCodeGenerator.cpp, the two "linking" spots in
gold-plugin.cpp, and llvm-link (unless -disable-debug-info-type-map) to
set this.

With this in place, it will be straightforward to remove the DITypeRef
concept (i.e., referencing types by their 'identifier:' string rather
than pointing at them directly).

llvm-svn: 266549

2 files changed, 46 insertions, 0 deletions

diff --git a/llvm/test/Linker/Inputs/dicompositetype-unique.ll b/llvm/test/Linker/Inputs/dicompositetype-unique.ll
new file mode 100644
index 00000000000..c2389e9a63c
--- /dev/null
+++ b/llvm/test/Linker/Inputs/dicompositetype-unique.ll
@@ -0,0 +1,4 @@
+!named = !{!0, !1}
+
+!0 = !DIFile(filename: "abc", directory: "/path/to")
+!1 = !DICompositeType(tag: DW_TAG_class_type, name: "T2", identifier: "T", file: !0)
diff --git a/llvm/test/Linker/dicompositetype-unique.ll b/llvm/test/Linker/dicompositetype-unique.ll
new file mode 100644
index 00000000000..9c8b351ec64
--- /dev/null
+++ b/llvm/test/Linker/dicompositetype-unique.ll
@@ -0,0 +1,42 @@
+; RUN: llvm-link -S -o - %s %S/Inputs/dicompositetype-unique.ll \
+; RUN:   | FileCheck %s
+; RUN: llvm-link -S -o - %S/Inputs/dicompositetype-unique.ll %s \
+; RUN:   | FileCheck %s -check-prefix REVERSE
+; RUN: llvm-link -disable-debug-info-type-map -S -o - %s %S/Inputs/dicompositetype-unique.ll \
+; RUN:   | FileCheck %s -check-prefix NOMAP
+
+; Check that the bitcode reader handles this too.
+; RUN: llvm-as -o %t1.bc <%s
+; RUN: llvm-as -o %t2.bc <%S/Inputs/dicompositetype-unique.ll
+; RUN: llvm-link -S -o - %t1.bc %t2.bc | FileCheck %s
+; RUN: llvm-link -S -o - %t2.bc %t1.bc | FileCheck %s -check-prefix REVERSE
+; RUN: llvm-link -disable-debug-info-type-map -S -o - %t1.bc %t2.bc \
+; RUN:   | FileCheck %s -check-prefix NOMAP
+
+; Check that the type map will unique two DICompositeTypes.
+
+; CHECK:   !named = !{!0, !1, !0, !1}
+; REVERSE: !named = !{!0, !1, !0, !1}
+; NOMAP:   !named = !{!0, !1, !0, !2}
+!named = !{!0, !1}
+
+; Check both directions.
+; CHECK:        !1 = !DICompositeType(
+; CHECK-SAME:                         name: "T1"
+; CHECK-SAME:                         identifier: "T"
+; CHECK-NOT:       identifier: "T"
+; REVERSE:      !1 = !DICompositeType(
+; REVERSE-SAME:                       name: "T2"
+; REVERSE-SAME:                       identifier: "T"
+; REVERSE-NOT:     identifier: "T"
+
+; These types are different, so we should get both copies when there is no map.
+; NOMAP:        !1 = !DICompositeType(
+; NOMAP-SAME:                         name: "T1"
+; NOMAP-SAME:                         identifier: "T"
+; NOMAP:        !2 = !DICompositeType(
+; NOMAP-SAME:                         name: "T2"
+; NOMAP-SAME:                         identifier: "T"
+; NOMAP-NOT:       identifier: "T"
+!0 = !DIFile(filename: "abc", directory: "/path/to")
+!1 = !DICompositeType(tag: DW_TAG_class_type, name: "T1", identifier: "T", file: !0)