Revert "Fix overly aggressive type merging."

This reverts commit r222727, which causes LTO bootstrap failures.

Last passing @ r222698:
http://lab.llvm.org:8080/green/job/clang-Rlto_master_build/532/

First failing @ r222843:
http://lab.llvm.org:8080/green/job/clang-Rlto_master_build/533/

Internal bootstraps pointed at a much narrower range: r222725 is
passing, and r222731 is failing.

LTO crashes while handling libclang.dylib:
http://lab.llvm.org:8080/green/job/clang-Rlto_master_build/533/consoleFull#-158682280549ba4694-19c4-4d7e-bec5-911270d8a58c

    GEP is not of right type for indices!
      %InfoObj.i.i = getelementptr inbounds %"class.llvm::OnDiskIterableChainedHashTable"* %.lcssa, i64 0, i32 0, i32 4, !dbg !123627
     %"class.clang::serialization::reader::ASTIdentifierLookupTrait" = type { %"class.clang::ASTReader.31859"*, %"class.clang::serialization::ModuleFile.31870"*, %"class.clang::IdentifierInfo"* }LLVM ERROR: Broken function found, compilation aborted!
    clang: error: linker command failed with exit code 1 (use -v to see invocation)

Looks like the new algorithm doesn't merge types aggressively enough.

llvm-svn: 222895

2 files changed, 0 insertions, 22 deletions

diff --git a/llvm/test/Linker/Inputs/type-unique-opaque.ll b/llvm/test/Linker/Inputs/type-unique-opaque.ll
deleted file mode 100644
index 872b601f691..00000000000
--- a/llvm/test/Linker/Inputs/type-unique-opaque.ll
+++ /dev/null
@@ -1,6 +0,0 @@
-%t = type { i8 }
-%t2 = type { %t*, i16 }
-
-define %t2* @f() {
-  ret %t2* null
-}
diff --git a/llvm/test/Linker/type-unique-opaque.ll b/llvm/test/Linker/type-unique-opaque.ll
deleted file mode 100644
index b4f69669921..00000000000
--- a/llvm/test/Linker/type-unique-opaque.ll
+++ /dev/null
@@ -1,16 +0,0 @@
-; RUN: llvm-link -S %s %p/Inputs/type-unique-opaque.ll | FileCheck %s
-
-; Test that a failed attempt at merging %u2 and %t2 (for the other file) will
-; not cause %u and %t to get merged.
-
-; CHECK: %u = type opaque
-; CHECK: define %u* @g() {
-
-%u = type opaque
-%u2 = type { %u*, i8 }
-
-declare %u2* @f()
-
-define %u* @g() {
-  ret %u* null
-}