[PATCH] D26622: Linker: Remove unnecessary call to copyMetadata in IRLinker::linkGlobalVariable.

[Peter Collingbourne via llvm-commits]

pcc created this revision.
pcc added a reviewer: aprantl.
pcc added a subscriber: llvm-commits.

This was causing us to create duplicate metadata on global variables.
Test case by Adrian Prantl.


https://reviews.llvm.org/D26622

Files:
  llvm/lib/Linker/IRMover.cpp
  llvm/test/Linker/debug-info-global-var.ll


Index: llvm/test/Linker/debug-info-global-var.ll
===================================================================
--- /dev/null
+++ llvm/test/Linker/debug-info-global-var.ll
@@ -0,0 +1,23 @@
+; RUN: llvm-link -S %s %S/debug-info-version-a.ll | FileCheck %s
+source_filename = "debug-info-global-var.c"
+target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-apple-macosx10.12.0"
+
+; CHECK: @g = global i32 0, align 4, !dbg ![[G:[0-9]+]]{{$}}
+ at g = global i32 0, align 4, !dbg !0
+
+!llvm.dbg.cu = !{!1}
+!llvm.module.flags = !{!6, !7, !8}
+!llvm.ident = !{!9}
+
+; CHECK: ![[G]] = distinct !DIGlobalVariable(name: "g"
+!0 = distinct !DIGlobalVariable(name: "g", scope: !1, file: !2, line: 1, type: !5, isLocal: false, isDefinition: true)
+!1 = distinct !DICompileUnit(language: DW_LANG_C99, file: !2, producer: "clang", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !3, globals: !4)
+!2 = !DIFile(filename: "debug-info-global-var.c", directory: "/")
+!3 = !{}
+!4 = !{!0}
+!5 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!6 = !{i32 2, !"Dwarf Version", i32 4}
+!7 = !{i32 2, !"Debug Info Version", i32 3}
+!8 = !{i32 1, !"PIC Level", i32 2}
+!9 = !{!"clang version 4.0.0 (trunk 286129) (llvm/trunk 286128)"}
Index: llvm/lib/Linker/IRMover.cpp
===================================================================
--- llvm/lib/Linker/IRMover.cpp
+++ llvm/lib/Linker/IRMover.cpp
@@ -950,8 +950,6 @@
 /// Update the initializers in the Dest module now that all globals that may be
 /// referenced are in Dest.
 void IRLinker::linkGlobalVariable(GlobalVariable &Dst, GlobalVariable &Src) {
-  Dst.copyMetadata(&Src, 0);
-
   // Figure out what the initializer looks like in the dest module.
   Mapper.scheduleMapGlobalInitializer(Dst, *Src.getInitializer());
 }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D26622.77845.patch
Type: text/x-patch
Size: 1834 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20161114/bd8738c8/attachment.bin>