[llvm] r286905 - Linker: Remove unnecessary call to copyMetadata in IRLinker::linkGlobalVariable.

[Peter Collingbourne via llvm-commits]

Author: pcc
Date: Mon Nov 14 17:18:38 2016
New Revision: 286905

URL: http://llvm.org/viewvc/llvm-project?rev=286905&view=rev
Log:
Linker: Remove unnecessary call to copyMetadata in IRLinker::linkGlobalVariable.

This was causing us to create duplicate metadata on global variables.
Debug info test case by Adrian Prantl, additional test cases by me.

Fixes PR31012.

Differential Revision: https://reviews.llvm.org/D26622

Added:
    llvm/trunk/test/Linker/Inputs/metadata-attach.ll
    llvm/trunk/test/Linker/debug-info-global-var.ll
Modified:
    llvm/trunk/lib/Linker/IRMover.cpp
    llvm/trunk/test/Linker/metadata-attach.ll

Modified: llvm/trunk/lib/Linker/IRMover.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Linker/IRMover.cpp?rev=286905&r1=286904&r2=286905&view=diff
==============================================================================
--- llvm/trunk/lib/Linker/IRMover.cpp (original)
+++ llvm/trunk/lib/Linker/IRMover.cpp Mon Nov 14 17:18:38 2016
@@ -950,8 +950,6 @@ Expected<Constant *> IRLinker::linkGloba
 /// 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());
 }

Added: llvm/trunk/test/Linker/Inputs/metadata-attach.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/Inputs/metadata-attach.ll?rev=286905&view=auto
==============================================================================
--- llvm/trunk/test/Linker/Inputs/metadata-attach.ll (added)
+++ llvm/trunk/test/Linker/Inputs/metadata-attach.ll Mon Nov 14 17:18:38 2016
@@ -0,0 +1,19 @@
+ at g1 = external global i32, !attach !0
+
+ at g2 = global i32 1, !attach !0
+
+ at g3 = global i32 2, !attach !0
+
+declare !attach !0 void @f1()
+
+define void @f2() !attach !0 {
+  call void @f1()
+  store i32 0, i32* @g1
+  ret void
+}
+
+define void @f3() !attach !0 {
+  ret void
+}
+
+!0 = !{i32 1}

Added: llvm/trunk/test/Linker/debug-info-global-var.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/debug-info-global-var.ll?rev=286905&view=auto
==============================================================================
--- llvm/trunk/test/Linker/debug-info-global-var.ll (added)
+++ llvm/trunk/test/Linker/debug-info-global-var.ll Mon Nov 14 17:18:38 2016
@@ -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)"}

Modified: llvm/trunk/test/Linker/metadata-attach.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/metadata-attach.ll?rev=286905&r1=286904&r2=286905&view=diff
==============================================================================
--- llvm/trunk/test/Linker/metadata-attach.ll (original)
+++ llvm/trunk/test/Linker/metadata-attach.ll Mon Nov 14 17:18:38 2016
@@ -1,12 +1,25 @@
 ; RUN: llvm-link %s -S -o - | FileCheck %s
+; RUN: llvm-link %s %S/Inputs/metadata-attach.ll -S -o - | FileCheck --check-prefix=CHECK-LINKED1 %s
+; RUN: llvm-link %S/Inputs/metadata-attach.ll %s -S -o - | FileCheck --check-prefix=CHECK-LINKED2 %s
 
-; CHECK: @g1 = global i32 0, !attach !0
+; CHECK: @g1 = global i32 0, !attach !0{{$}}
+; CHECK-LINKED1: @g1 = global i32 0, !attach !0{{$}}
 @g1 = global i32 0, !attach !0
 
-; CHECK: @g2 = external global i32, !attach !0
+; CHECK: @g3 = weak global i32 1, !attach !0{{$}}
+; CHECK: @g2 = external global i32, !attach !0{{$}}
+; CHECK-LINKED1: @g2 = global i32 1, !attach !1{{$}}
 @g2 = external global i32, !attach !0
 
-; CHECK: define void @f1() !attach !0
+; CHECK-LINKED1: @g3 = global i32 2, !attach !1{{$}}
+ at g3 = weak global i32 1, !attach !0
+
+; CHECK-LINKED2: @g2 = global i32 1, !attach !0{{$}}
+; CHECK-LINKED2: @g3 = global i32 2, !attach !0{{$}}
+; CHECK-LINKED2: @g1 = global i32 0, !attach !1{{$}}
+
+; CHECK: define void @f1() !attach !0 {
+; CHECK-LINKED1: define void @f1() !attach !0 {
 define void @f1() !attach !0 {
   call void @f2()
   store i32 0, i32* @g2
@@ -14,6 +27,23 @@ define void @f1() !attach !0 {
 }
 
 ; CHECK: declare !attach !0 void @f2()
+; CHECK-LINKED1: define void @f2() !attach !1 {
 declare !attach !0 void @f2()
 
-!0 = !{}
+; CHECK: define weak void @f3() !attach !0 {
+; CHECK-LINKED1: define void @f3() !attach !1 {
+define weak void @f3() !attach !0 {
+  ret void
+}
+
+; CHECK-LINKED2: define void @f2() !attach !0 {
+; CHECK-LINKED2: define void @f3() !attach !0 {
+; CHECK-LINKED2: define void @f1() !attach !1 {
+
+; CHECK-LINKED1: !0 = !{i32 0}
+; CHECK-LINKED1: !1 = !{i32 1}
+
+; CHECK-LINKED2: !0 = !{i32 1}
+; CHECK-LINKED2: !1 = !{i32 0}
+
+!0 = !{i32 0}