<div dir="ltr">Merged to 6.0 in r323854.</div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Jan 30, 2018 at 9:16 PM, Teresa Johnson via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: tejohnson<br>
Date: Tue Jan 30 12:16:32 2018<br>
New Revision: 323813<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=323813&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=323813&view=rev</a><br>
Log:<br>
Teach ValueMapper to use ODR uniqued types when available<br>
<br>
Summary:<br>
This is exposed during ThinLTO compilation, when we import an alias by<br>
creating a clone of the aliasee. Without this fix the debug type is<br>
unnecessarily cloned and we get a duplicate, undoing the uniquing.<br>
<br>
Fixes PR36089.<br>
<br>
Reviewers: mehdi_amini, pcc<br>
<br>
Subscribers: eraman, JDevlieghere, llvm-commits<br>
<br>
Differential Revision: <a href="https://reviews.llvm.org/D41669" rel="noreferrer" target="_blank">https://reviews.llvm.org/<wbr>D41669</a><br>
<br>
Added:<br>
llvm/trunk/test/ThinLTO/X86/<wbr>Inputs/dicompositetype-unique-<wbr>alias.ll<br>
llvm/trunk/test/ThinLTO/X86/<wbr>dicompositetype-unique-alias.<wbr>ll<br>
Modified:<br>
llvm/trunk/lib/Transforms/<wbr>Utils/ValueMapper.cpp<br>
<br>
Modified: llvm/trunk/lib/Transforms/<wbr>Utils/ValueMapper.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/ValueMapper.cpp?rev=323813&r1=323812&r2=323813&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/lib/<wbr>Transforms/Utils/ValueMapper.<wbr>cpp?rev=323813&r1=323812&r2=<wbr>323813&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/lib/Transforms/<wbr>Utils/ValueMapper.cpp (original)<br>
+++ llvm/trunk/lib/Transforms/<wbr>Utils/ValueMapper.cpp Tue Jan 30 12:16:32 2018<br>
@@ -25,6 +25,7 @@<br>
#include "llvm/IR/CallSite.h"<br>
#include "llvm/IR/Constant.h"<br>
#include "llvm/IR/Constants.h"<br>
+#include "llvm/IR/DebugInfoMetadata.h"<br>
#include "llvm/IR/DerivedTypes.h"<br>
#include "llvm/IR/Function.h"<br>
#include "llvm/IR/GlobalAlias.h"<br>
@@ -536,13 +537,23 @@ Optional<Metadata *> MDNodeMapper::tryTo<br>
return None;<br>
}<br>
<br>
+static Metadata *cloneOrBuildODR(const MDNode &N) {<br>
+ auto *CT = dyn_cast<DICompositeType>(&N);<br>
+ // If ODR type uniquing is enabled, we would have uniqued composite types<br>
+ // with identifiers during bitcode reading, so we can just use CT.<br>
+ if (CT && CT->getContext().<wbr>isODRUniquingDebugTypes() &&<br>
+ CT->getIdentifier() != "")<br>
+ return const_cast<DICompositeType *>(CT);<br>
+ return MDNode::replaceWithDistinct(N.<wbr>clone());<br>
+}<br>
+<br>
MDNode *MDNodeMapper::<wbr>mapDistinctNode(const MDNode &N) {<br>
assert(N.isDistinct() && "Expected a distinct node");<br>
assert(!M.getVM().getMappedMD(<wbr>&N) && "Expected an unmapped node");<br>
- DistinctWorklist.push_back(<wbr>cast<MDNode>(<br>
- (M.Flags & RF_MoveDistinctMDs)<br>
- ? M.mapToSelf(&N)<br>
- : M.mapToMetadata(&N, MDNode::replaceWithDistinct(N.<wbr>clone()))));<br>
+ DistinctWorklist.push_back(<br>
+ cast<MDNode>((M.Flags & RF_MoveDistinctMDs)<br>
+ ? M.mapToSelf(&N)<br>
+ : M.mapToMetadata(&N, cloneOrBuildODR(N))));<br>
return DistinctWorklist.back();<br>
}<br>
<br>
<br>
Added: llvm/trunk/test/ThinLTO/X86/<wbr>Inputs/dicompositetype-unique-<wbr>alias.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ThinLTO/X86/Inputs/dicompositetype-unique-alias.ll?rev=323813&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/test/<wbr>ThinLTO/X86/Inputs/<wbr>dicompositetype-unique-alias.<wbr>ll?rev=323813&view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/test/ThinLTO/X86/<wbr>Inputs/dicompositetype-unique-<wbr>alias.ll (added)<br>
+++ llvm/trunk/test/ThinLTO/X86/<wbr>Inputs/dicompositetype-unique-<wbr>alias.ll Tue Jan 30 12:16:32 2018<br>
@@ -0,0 +1,39 @@<br>
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:<wbr>32:64-S128"<br>
+target triple = "x86_64-scei-ps4"<br>
+<br>
+%struct.CFVS = type { %struct.Vec }<br>
+%struct.Vec = type { i8 }<br>
+%struct.S = type { i8 }<br>
+<br>
+@_ZN4CFVSD1Ev = alias void (%struct.CFVS*), void (%struct.CFVS*)* @_ZN4CFVSD2Ev<br>
+<br>
+define void @_ZN4CFVSD2Ev(%struct.CFVS* %this) unnamed_addr align 2 !dbg !8 {<br>
+entry:<br>
+ %this.addr = alloca %struct.CFVS*, align 8<br>
+ store %struct.CFVS* %this, %struct.CFVS** %this.addr, align 8<br>
+ %this1 = load %struct.CFVS*, %struct.CFVS** %this.addr, align 8<br>
+ %m_val = getelementptr inbounds %struct.CFVS, %struct.CFVS* %this1, i32 0, i32 0<br>
+ ret void<br>
+}<br>
+<br>
+declare dereferenceable(1) %struct.S* @_Z3Getv()<br>
+<br>
+!<a href="http://llvm.dbg.cu" rel="noreferrer" target="_blank">llvm.dbg.cu</a> = !{!0}<br>
+!llvm.module.flags = !{!3, !4, !5, !6}<br>
+<br>
+!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus, file: !1, producer: "clang version 6.0.0 (trunk 321360) (llvm/trunk 321359)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2)<br>
+!1 = !DIFile(filename: "bz188598-b.cpp", directory: "")<br>
+!2 = !{}<br>
+!3 = !{i32 2, !"Dwarf Version", i32 4}<br>
+!4 = !{i32 2, !"Debug Info Version", i32 3}<br>
+!5 = !{i32 1, !"wchar_size", i32 2}<br>
+!6 = !{i32 7, !"PIC Level", i32 2}<br>
+!8 = distinct !DISubprogram(name: "~CFVS", linkageName: "_ZN4CFVSD2Ev", scope: !9, file: !1, line: 2, type: !28, isLocal: false, isDefinition: true, scopeLine: 2, flags: DIFlagPrototyped, isOptimized: false, unit: !0, declaration: !27, variables: !2)<br>
+!9 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "CFVS", file: !10, line: 7, size: 8, elements: !11, identifier: "_ZTS4CFVS")<br>
+!10 = !DIFile(filename: "./bz188598.h", directory: "")<br>
+!11 = !{!35}<br>
+!27 = !DISubprogram(name: "~CFVS", scope: !9, file: !10, line: 8, type: !28, isLocal: false, isDefinition: false, scopeLine: 8, flags: DIFlagPrototyped, isOptimized: false)<br>
+!28 = !DISubroutineType(types: !29)<br>
+!29 = !{null, !30}<br>
+!30 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !9, size: 64, flags: DIFlagArtificial | DIFlagObjectPointer)<br>
+!35 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)<br>
<br>
Added: llvm/trunk/test/ThinLTO/X86/<wbr>dicompositetype-unique-alias.<wbr>ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ThinLTO/X86/dicompositetype-unique-alias.ll?rev=323813&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/test/<wbr>ThinLTO/X86/dicompositetype-<wbr>unique-alias.ll?rev=323813&<wbr>view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/test/ThinLTO/X86/<wbr>dicompositetype-unique-alias.<wbr>ll (added)<br>
+++ llvm/trunk/test/ThinLTO/X86/<wbr>dicompositetype-unique-alias.<wbr>ll Tue Jan 30 12:16:32 2018<br>
@@ -0,0 +1,62 @@<br>
+; RUN: opt -module-summary -o %t1.bc %s<br>
+; RUN: opt -module-summary -o %t2.bc %S/Inputs/dicompositetype-<wbr>unique-alias.ll<br>
+; RUN: llvm-lto --thinlto-action=run %t1.bc %t2.bc -thinlto-save-temps=%t3.<br>
+; RUN: llvm-dis %t3.0.3.imported.bc -o - | FileCheck %s<br>
+; RUN: llvm-lto2 run %t1.bc %t2.bc -o %t --save-temps \<br>
+; RUN: -r %t1.bc,_ZN1CD2Ev,pl \<br>
+; RUN: -r %t1.bc,_ZN4CFVSD1Ev,l \<br>
+; RUN: -r %t1.bc,_ZN4CFVSD2Ev,l \<br>
+; RUN: -r %t1.bc,_Z3Getv,l \<br>
+; RUN: -r %t2.bc,_ZN4CFVSD1Ev,pl \<br>
+; RUN: -r %t2.bc,_ZN4CFVSD2Ev,pl \<br>
+; RUN: -r %t2.bc,_Z3Getv,l<br>
+; RUN: llvm-dis %t.1.3.import.bc -o - | FileCheck %s<br>
+<br>
+; Only llvm-lto2 adds the dso_local keyword, hence the {{.*}}<br>
+; CHECK: define available_externally{{.*}} void @_ZN4CFVSD1Ev<br>
+<br>
+; Confirm that we only have a single DICompositeType after importing<br>
+; both an alias and its aliasee, since ODR Type Uniquing is enabled.<br>
+; CHECK: DICompositeType<br>
+; CHECK-NOT: DICompositeType<br>
+<br>
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:<wbr>32:64-S128"<br>
+target triple = "x86_64-scei-ps4"<br>
+<br>
+%class.C = type <{ i32 (...)**, %class.A, %struct.CFVS, [6 x i8] }><br>
+%class.A = type { %struct.Vec }<br>
+%struct.Vec = type { i8 }<br>
+%struct.CFVS = type { %struct.Vec }<br>
+%struct.S = type { i8 }<br>
+<br>
+define void @_ZN1CD2Ev(%class.C* %this) unnamed_addr align 2 {<br>
+entry:<br>
+ %this.addr = alloca %class.C*, align 8<br>
+ %this1 = load %class.C*, %class.C** %this.addr, align 8<br>
+ %m = getelementptr inbounds %class.C, %class.C* %this1, i32 0, i32 2<br>
+ call void @_ZN4CFVSD1Ev(%struct.CFVS* %m), !dbg !50<br>
+ call void @_ZN4CFVSD2Ev(%struct.CFVS* %m), !dbg !50<br>
+ ret void<br>
+}<br>
+<br>
+declare void @_ZN4CFVSD1Ev(%struct.CFVS*) unnamed_addr<br>
+declare void @_ZN4CFVSD2Ev(%struct.CFVS*) unnamed_addr<br>
+<br>
+declare dereferenceable(1) %struct.S* @_Z3Getv()<br>
+<br>
+!<a href="http://llvm.dbg.cu" rel="noreferrer" target="_blank">llvm.dbg.cu</a> = !{!0}<br>
+!llvm.module.flags = !{!3, !4, !5, !6}<br>
+<br>
+!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus, file: !1, producer: "clang version 6.0.0 (trunk 321360) (llvm/trunk 321359)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2)<br>
+!1 = !DIFile(filename: "bz188598-a.cpp", directory: ".")<br>
+!2 = !{}<br>
+!3 = !{i32 2, !"Dwarf Version", i32 4}<br>
+!4 = !{i32 2, !"Debug Info Version", i32 3}<br>
+!5 = !{i32 1, !"wchar_size", i32 2}<br>
+!6 = !{i32 7, !"PIC Level", i32 2}<br>
+!8 = distinct !DISubprogram(name: "~C", linkageName: "_ZN1CD2Ev", scope: !1, file: !1, line: 9, type: !47, isLocal: false, isDefinition: true, scopeLine: 9, flags: DIFlagPrototyped, isOptimized: false, unit: !0, variables: !2)<br>
+!47 = !DISubroutineType(types: !48)<br>
+!48 = !{!55}<br>
+!50 = !DILocation(line: 9, scope: !51)<br>
+!51 = distinct !DILexicalBlock(scope: !8, file: !1, line: 9)<br>
+!55 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)<br>
<br>
<br>
______________________________<wbr>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>