From 6f16ac1473e5e7df1fce4210716851dea9f58a1e Mon Sep 17 00:00:00 2001
From: Peter Collingbourne <peter@pcc.me.uk>
Date: Fri, 20 Jan 2017 22:39:16 +0000
Subject: [PATCH] IRGen: Start using the WriteThinLTOBitcode pass.

This is the final change necessary to support CFI with ThinLTO.

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

llvm-svn: 292662
---
 clang/lib/CodeGen/BackendUtil.cpp               |  8 +++++---
 clang/test/CMakeLists.txt                       |  1 +
 clang/test/CodeGenCXX/type-metadata-thinlto.cpp | 11 +++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 clang/test/CodeGenCXX/type-metadata-thinlto.cpp

diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp
index bac1e89820a80..4fdffdeae4166 100644
--- a/clang/lib/CodeGen/BackendUtil.cpp
+++ b/clang/lib/CodeGen/BackendUtil.cpp
@@ -689,9 +689,11 @@ void EmitAssemblyHelper::EmitAssembly(BackendAction Action,
     break;
 
   case Backend_EmitBC:
-    PerModulePasses.add(createBitcodeWriterPass(
-        *OS, CodeGenOpts.EmitLLVMUseLists, CodeGenOpts.EmitSummaryIndex,
-        CodeGenOpts.EmitSummaryIndex));
+    if (CodeGenOpts.EmitSummaryIndex)
+      PerModulePasses.add(createWriteThinLTOBitcodePass(*OS));
+    else
+      PerModulePasses.add(
+          createBitcodeWriterPass(*OS, CodeGenOpts.EmitLLVMUseLists));
     break;
 
   case Backend_EmitLL:
diff --git a/clang/test/CMakeLists.txt b/clang/test/CMakeLists.txt
index e3371994aedbb..6e6acb72ab2b0 100644
--- a/clang/test/CMakeLists.txt
+++ b/clang/test/CMakeLists.txt
@@ -80,6 +80,7 @@ if( NOT CLANG_BUILT_STANDALONE )
     llc
     llvm-bcanalyzer
     llvm-dis
+    llvm-modextract
     llvm-nm
     llvm-objdump
     llvm-profdata
diff --git a/clang/test/CodeGenCXX/type-metadata-thinlto.cpp b/clang/test/CodeGenCXX/type-metadata-thinlto.cpp
new file mode 100644
index 0000000000000..2a586fc4c37cb
--- /dev/null
+++ b/clang/test/CodeGenCXX/type-metadata-thinlto.cpp
@@ -0,0 +1,11 @@
+// RUN: %clang_cc1 -flto=thin -flto-unit -triple x86_64-unknown-linux -fvisibility hidden -emit-llvm-bc -o %t %s
+// RUN: llvm-modextract -o - -n 1 %t | llvm-dis | FileCheck %s
+
+// CHECK: @_ZTV1A = linkonce_odr
+class A {
+  virtual void f() {}
+};
+
+A *f() {
+  return new A;
+}