[llvm] r254344 - Disable a consistency check.

[Rafael Espindola via llvm-commits]

Author: rafael
Date: Mon Nov 30 17:05:25 2015
New Revision: 254344

URL: http://llvm.org/viewvc/llvm-project?rev=254344&view=rev
Log:
Disable a consistency check.

Trying to figure out why it fails on a bot but passes locally.

Removed:
    llvm/trunk/test/Linker/Inputs/comdat13.ll
    llvm/trunk/test/Linker/comdat13.ll
Modified:
    llvm/trunk/lib/Linker/LinkModules.cpp

Modified: llvm/trunk/lib/Linker/LinkModules.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Linker/LinkModules.cpp?rev=254344&r1=254343&r2=254344&view=diff
==============================================================================
--- llvm/trunk/lib/Linker/LinkModules.cpp (original)
+++ llvm/trunk/lib/Linker/LinkModules.cpp Mon Nov 30 17:05:25 2015
@@ -940,12 +940,8 @@ void ModuleLinker::materializeInitFor(Gl
   if (isPerformingImport() && !doImportAsDefinition(Old))
     return;
 
-  if (DoNotLinkFromSource.count(Old)) {
-    if (!New->hasExternalLinkage() && !New->hasExternalWeakLinkage() &&
-        !New->hasAppendingLinkage())
-      emitError("Declaration points to discarded value");
+  if (DoNotLinkFromSource.count(Old))
     return;
-  }
 
   linkGlobalValueBody(*Old);
 }

Removed: llvm/trunk/test/Linker/Inputs/comdat13.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/Inputs/comdat13.ll?rev=254343&view=auto
==============================================================================
--- llvm/trunk/test/Linker/Inputs/comdat13.ll (original)
+++ llvm/trunk/test/Linker/Inputs/comdat13.ll (removed)
@@ -1,9 +0,0 @@
-$foo = comdat any
- at foo = global i8 1, comdat
-define void @zed() {
-  call void @bar()
-  ret void
-}
-define internal void @bar() comdat($foo) {
-  ret void
-}

Removed: llvm/trunk/test/Linker/comdat13.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/comdat13.ll?rev=254343&view=auto
==============================================================================
--- llvm/trunk/test/Linker/comdat13.ll (original)
+++ llvm/trunk/test/Linker/comdat13.ll (removed)
@@ -1,13 +0,0 @@
-; RUN: not llvm-link -S %s %p/Inputs/comdat13.ll -o %t.ll 2>&1 | FileCheck %s
-
-; In Inputs/comdat13.ll a function not in the $foo comdat (zed) references an
-; internal function in the comdat $foo.
-; We might want to have the verifier reject that, but for now we at least check
-; that the linker produces an error.
-; This is the IR equivalent of the "relocation refers to discarded section" in
-; an ELF linker.
-
-; CHECK: Declaration points to discarded value
-
-$foo = comdat any
- at foo = global i8 0, comdat