[ThinLTO/CFI] Include TYPE_ID summaries into GLOBALVAL_SUMMARY_BLOCK

[vitalybuka]

Summary

TypeID summaries are used by CFI and need to be serialized by ThinLTO
indexing for later use by LTO Backend.

[vitalybuka]

rebase

[pcc]

This needs more tests. In particular you should have:

1. More test coverage for serialization.
2. A test for the bitcode reader functionality. This should probably be in the form of a test that simulates a distributed build and shows that the correct resolution is passed to the backend. There are a few examples in clang/test/CodeGen/thinlto-* but they all use the legacy LTO API driver (llvm-lto) which is incompatible with ThinLTO+CFI, so you will probably need to have your test use llvm-lto2 (with the -thinlto-distributed-indexes flag).

[vitalybuka]

lto2 test

[vitalybuka]

added tests without devirtualization

[vitalybuka]

typo

[vitalybuka]

removed -mconstructor-aliases flag in tests

[pcc]

clang/test/CodeGen/thinlto-distributed-cfi-devirt.cpp

8

I wonder whether you can simplify this test by making this a .ll file and using opt -thinlto-bc to create the .o file.

73

I think this will only work on Linux. Same goes for your other tests.

75

It may be simpler to test the effect of lowertypetests by passing -emit-llvm to clang and examining the IR.

clang/test/CodeGen/thinlto-distributed-cfi.cpp

81

Since this test and thinlto-distributed-cfi-devirt.cpp use the same inputs, you can merge them into one file.

[vitalybuka]

clang/test/CodeGen/thinlto-distributed-cfi-devirt.cpp

8

I tried tried that from beginning but failed.
Simple dump of %t.o after passing to -thinlto-bc does not produces similar <TYPE_ID> in summaries

73

Would you prefer if I just remove linking or limit test to linux?

[vitalybuka]

updates for comments

[vitalybuka]

fixed typo and added dependency on llvm-lto2

[vitalybuka]

c/cpp -> IR

[vitalybuka]

revert debug change

[vitalybuka]

remove unneeded code

[vitalybuka]

more code removed

[vitalybuka]

update comments

[pcc]

clang/test/CodeGen/thinlto-distributed-cfi-devirt.ll

39–43 ↗

(On Diff #133986)

I would move these alongside the IR that is being tested.

58–59 ↗

(On Diff #133986)

Remove these.

69 ↗

(On Diff #133986)

This intrinsic call looks a little odd if the intent is to test that whole-program devirtualization was not applied. In principle it could be locally devirtualized by loading a function pointer from the constant _ZTV1B, which would make the branch below unconditional. Can you instead load a vtable from a passed-in object and pass that to the intrinsic? Basically, make this look like call2 or call3 in llvm/test/Transforms/WholeProgramDevirt/import.ll. The same goes for the other call below.

It was also a little surprising to me at first that this wasn't virtual-const-propagated, but I guess the reason why it wasn't is that you are passing an argument of type double. A more reliable way of preventing virtual const prop would be to pass undef as one of the arguments (see call2 in the same test).

82 ↗

(On Diff #133986)

Can you please also include testing for successful devirtualization? I guess you could do that by changing the metadata here to !"_ZTS1B" and testing that the call was successfully single-impl-devirtualized.

clang/test/CodeGen/thinlto-distributed-cfi.ll

27 ↗

(On Diff #133986)

You could write -o - here and pipe into FileCheck as usual.

49 ↗

(On Diff #133986)

The backend could in principle replace this with true because the first argument is a constant. Could you instead add an argument to main and pass that argument through as the first argument here?

[vitalybuka]

resolved trivial comments

[vitalybuka]

add devirtualization checks

[pcc]

LGTM

clang/test/CodeGen/thinlto-distributed-cfi-devirt.ll

59 ↗

(On Diff #134313)

Move this to before line 71.

93 ↗

(On Diff #134313)

I think you can remove this main function as well as the one in thinlto-distributed-cfi.ll.

[vitalybuka]

Remove unneeded main() functions

[vitalybuka]

clang/test/CodeGen/thinlto-distributed-cfi-devirt.ll

59 ↗

(On Diff #134313)

done in r325184

clang/test/CodeGen/Inputs/thinlto-distributed-cfi.cpp

+struct A {
+  virtual int f() = 0;
+};
+
+struct B : public A {
+  int f() override { return 50; };
+};
+
+struct C : public A {
+  int f() override { return 7; };
+};
+
+struct D {
+  virtual int d(int a, int b) { return a + b; };
+};
+
+int main(int argc, char *argv[]) {
+  A *b = new B;
+  A *c = new C;
+  D *d = new D;
+  return d->d(b->f(), c->f()) != 57;
+}

clang/test/CodeGen/thinlto-distributed-cfi-devirt.cpp

+// REQUIRES: x86-registered-target
+
+// Test that distribute ThinLTO with CFI creates working binary.
+// It additionally enables -fwhole-program-vtables to get more information in
+// TYPE_IDs of GLOBALVAL_SUMMARY_BLOCK.
+
+// RUN: %clang_cc1 -triple x86_64-grtev4-linux-gnu -emit-llvm-bc \
+// RUN:   -flto=thin -flto-unit -fvisibility hidden \
+// RUN:   -fwhole-program-vtables -x c++ \
+// RUN:   -fsanitize=cfi-derived-cast,cfi-vcall \
+// RUN:   -fsanitize-trap=cfi-derived-cast,cfi-vcall \
+// RUN:   -fthin-link-bitcode=%t.indexing.o \
+// RUN:   %S/Inputs/thinlto-distributed-cfi.cpp -o %t.o
+
+// RUN: llvm-lto2 run -thinlto-distributed-indexes %t.o \
+// RUN:   -o %t2.index \
+// RUN:   -r=%t.o,_Znwm, \
+// RUN:   -r=%t.o,_ZN1BC2Ev,p \
+// RUN:   -r=%t.o,_ZN1CC2Ev,p \
+// RUN:   -r=%t.o,_ZN1DC2Ev,p \
+// RUN:   -r=%t.o,_ZN1BC1Ev,p \
+// RUN:   -r=%t.o,_ZN1CC1Ev,p \
+// RUN:   -r=%t.o,_ZN1DC1Ev,p \
+// RUN:   -r=%t.o,main,px \
+// RUN:   -r=%t.o,_ZN1AC2Ev,p \
+// RUN:   -r=%t.o,_ZN1B1fEv,p \
+// RUN:   -r=%t.o,__cxa_pure_virtual, \
+// RUN:   -r=%t.o,_ZN1C1fEv,p \
+// RUN:   -r=%t.o,_ZN1D1dEii,p \
+// RUN:   -r=%t.o,_ZTV1B, \
+// RUN:   -r=%t.o,_ZTVN10__cxxabiv120__si_class_type_infoE, \
+// RUN:   -r=%t.o,_ZTS1B,p \
+// RUN:   -r=%t.o,_ZTVN10__cxxabiv117__class_type_infoE, \
+// RUN:   -r=%t.o,_ZTS1A,p \
+// RUN:   -r=%t.o,_ZTI1A,p \
+// RUN:   -r=%t.o,_ZTI1B,p \
+// RUN:   -r=%t.o,_ZTV1A, \
+// RUN:   -r=%t.o,_ZTV1C, \
+// RUN:   -r=%t.o,_ZTS1C,p \
+// RUN:   -r=%t.o,_ZTI1C,p \
+// RUN:   -r=%t.o,_ZTV1D, \
+// RUN:   -r=%t.o,_ZTS1D,p \
+// RUN:   -r=%t.o,_ZTI1D,p \
+// RUN:   -r=%t.o,__cxa_pure_virtual, \
+// RUN:   -r=%t.o,_ZN1B1fEv, \
+// RUN:   -r=%t.o,_ZN1C1fEv, \
+// RUN:   -r=%t.o,_ZN1D1dEii, \
+// RUN:   -r=%t.o,_ZTV1B,p \
+// RUN:   -r=%t.o,_ZTI1A, \
+// RUN:   -r=%t.o,_ZTI1B, \
+// RUN:   -r=%t.o,_ZTV1A,p \
+// RUN:   -r=%t.o,_ZTV1C,p \
+// RUN:   -r=%t.o,_ZTI1C, \
+// RUN:   -r=%t.o,_ZTV1D,p \
+// RUN:   -r=%t.o,_ZTI1D,
+
+// Ensure that typeids are in the index.
+// R1UN: llvm-bcanalyzer -dump %t.o.thinlto.bc | FileCheck %s
+// CHECK-LABEL: <GLOBALVAL_SUMMARY_BLOCK
+// CHECK: <TYPE_ID op0=0 op1=6 op2=4 op3=7 op4=0 op5=0 op6=0 op7=0 op8=0 op9=0 op10=6 op11=0 op12=0/>
+// CHECK: <TYPE_ID op0=6 op1=6 op2=0 op3=0 op4=0 op5=0 op6=0 op7=0 op8=0 op9=1 op10=12 op11=10 op12=0/>
+// CHECK-LABEL: </GLOBALVAL_SUMMARY_BLOCK
+// CHECK-LABEL: <STRTAB_BLOCK
+// CHECK: blob data = '_ZTS1A_ZTS1D_ZN1D1dEii'
+// CHECK-LABEL: </STRTAB_BLOCK
+
+// Ensure that traps are conditional. Invalid TYPE_ID can cause
+// unconditional traps.
+// RUN: %clang_cc1 -triple x86_64-grtev4-linux-gnu \
+// RUN:   -emit-obj -fthinlto-index=%t.o.thinlto.bc \
+// RUN:   -emit-llvm -o %t.ll -x ir %t.o
+// RUN: FileCheck --input-file %t.ll %s --check-prefixes=CHECK-IR
+// CHECK-IR-LABEL: define hidden i32 @main
+// CHECK-IR: br i1 {{.*}}, label %trap
+// CHECK-IR: br i1 {{.*}}, label %trap
+// CHECK-IR-LABEL: ret i32 %conv
+// CHECK-IR-LABEL: }
+
+// Ensure that backend does not fail generating native code.
+// RUN: %clang_cc1 -triple x86_64-grtev4-linux-gnu \
+// RUN:   -emit-obj -fthinlto-index=%t.o.thinlto.bc \
+// RUN:   -o %t.native.o -x ir %t.o

clang/test/CodeGen/thinlto-distributed-cfi.cpp

+// REQUIRES: x86-registered-target
+
+// Test that distribute ThinLTO with CFI creates working binary.
+
+// RUN: %clang_cc1 -triple x86_64-grtev4-linux-gnu -emit-llvm-bc -x c++ \
+// RUN:   -flto=thin -flto-unit -fvisibility hidden \
+// RUN:   -fsanitize=cfi-derived-cast,cfi-vcall \
+// RUN:   -fsanitize-trap=cfi-derived-cast,cfi-vcall \
+// RUN:   -fthin-link-bitcode=%t.indexing.o \
+// RUN:   %S/Inputs/thinlto-distributed-cfi.cpp -o %t.o
+
+// RUN: llvm-lto2 run -thinlto-distributed-indexes %t.o \
+// RUN:   -o %t2.index \
+// RUN:   -r=%t.o,_Znwm, \
+// RUN:   -r=%t.o,_ZN1BC2Ev,p \
+// RUN:   -r=%t.o,_ZN1CC2Ev,p \
+// RUN:   -r=%t.o,_ZN1DC2Ev,p \
+// RUN:   -r=%t.o,_ZN1BC1Ev,p \
+// RUN:   -r=%t.o,_ZN1CC1Ev,p \
+// RUN:   -r=%t.o,_ZN1DC1Ev,p \
+// RUN:   -r=%t.o,main,px \
+// RUN:   -r=%t.o,_ZN1AC2Ev,p \
+// RUN:   -r=%t.o,_ZN1B1fEv,p \
+// RUN:   -r=%t.o,__cxa_pure_virtual, \
+// RUN:   -r=%t.o,_ZN1C1fEv,p \
+// RUN:   -r=%t.o,_ZN1D1dEii,p \
+// RUN:   -r=%t.o,_ZTV1B, \
+// RUN:   -r=%t.o,_ZTVN10__cxxabiv120__si_class_type_infoE, \
+// RUN:   -r=%t.o,_ZTS1B,p \
+// RUN:   -r=%t.o,_ZTVN10__cxxabiv117__class_type_infoE, \
+// RUN:   -r=%t.o,_ZTS1A,p \
+// RUN:   -r=%t.o,_ZTI1A,p \
+// RUN:   -r=%t.o,_ZTI1B,p \
+// RUN:   -r=%t.o,_ZTV1A, \
+// RUN:   -r=%t.o,_ZTV1C, \
+// RUN:   -r=%t.o,_ZTS1C,p \
+// RUN:   -r=%t.o,_ZTI1C,p \
+// RUN:   -r=%t.o,_ZTV1D, \
+// RUN:   -r=%t.o,_ZTS1D,p \
+// RUN:   -r=%t.o,_ZTI1D,p \
+// RUN:   -r=%t.o,__cxa_pure_virtual, \
+// RUN:   -r=%t.o,_ZN1B1fEv, \
+// RUN:   -r=%t.o,_ZN1C1fEv, \
+// RUN:   -r=%t.o,_ZN1D1dEii, \
+// RUN:   -r=%t.o,_ZTV1B,p \
+// RUN:   -r=%t.o,_ZTI1A, \
+// RUN:   -r=%t.o,_ZTI1B, \
+// RUN:   -r=%t.o,_ZTV1A,p \
+// RUN:   -r=%t.o,_ZTV1C,p \
+// RUN:   -r=%t.o,_ZTI1C, \
+// RUN:   -r=%t.o,_ZTV1D,p \
+// RUN:   -r=%t.o,_ZTI1D,
+
+// Ensure that typeids are in the index.
+// RUN: llvm-bcanalyzer -dump %t.o.thinlto.bc | FileCheck %s
+// CHECK-LABEL: <GLOBALVAL_SUMMARY_BLOCK
+// CHECK: <TYPE_ID op0=0 op1=6 op2=4 op3=7 op4=0 op5=0 op6=0 op7=0/>
+// CHECK: <TYPE_ID op0=6 op1=6 op2=3 op3=0 op4=0 op5=0 op6=0 op7=0/>
+// CHECK-LABEL: </GLOBALVAL_SUMMARY_BLOCK
+// CHECK-LABEL: <STRTAB_BLOCK
+// CHECK: blob data = '_ZTS1A_ZTS1D'
+// CHECK-LABEL: </STRTAB_BLOCK
+
+// Ensure that traps are conditional. Invalid TYPE_ID can cause
+// unconditional traps.
+// RUN: %clang_cc1 -triple x86_64-grtev4-linux-gnu \
+// RUN:   -emit-obj -fthinlto-index=%t.o.thinlto.bc \
+// RUN:   -emit-llvm -o %t.ll -x ir %t.o
+// RUN: FileCheck --input-file %t.ll %s --check-prefixes=CHECK-IR
+// CHECK-IR-LABEL: define hidden i32 @main
+// CHECK-IR: br i1 {{.*}}, label %trap
+// CHECK-IR: br i1 {{.*}}, label %trap
+// CHECK-IR-LABEL: ret i32 %conv
+// CHECK-IR-LABEL: }
+
+// Ensure that backend does not fail generating native code.
+// RUN: %clang_cc1 -triple x86_64-grtev4-linux-gnu \
+// RUN:   -emit-obj -fthinlto-index=%t.o.thinlto.bc \
+// RUN:   -o %t.native.o -x ir %t.o

clang/test/CodeGen/thinlto-distributed.c

+// REQUIRES: x86-registered-target
+
+// Trivial integration test for distributes ThinLTO
+
+// RUN: %clang_cc1 -triple x86_64-grtev4-linux-gnu -emit-llvm-bc \
+// RUN:   -flto=thin -flto-unit \
+// RUN:   -fthin-link-bitcode=%t.indexing.o %s -o %t.o
+
+// RUN: llvm-lto2 run -thinlto-distributed-indexes %t.o \
+// RUN:   -o %t2.index \
+// RUN:   -r=%t.o,main,px
+
+// RUN: %clang_cc1 -triple x86_64-grtev4-linux-gnu \
+// RUN:   -emit-obj -fthinlto-index=%t.o.thinlto.bc \
+// RUN:   -o %t.native.o -x ir %t.o
+
+// RUN: %clang %t.native.o %t2.index.0 -o %t
+
+int main(int argc, char *argv[]) {
+  return 0;
+}

llvm/include/llvm/Bitcode/LLVMBitCodes.h

enum GlobalValueSummarySymtabCodes {
   FS_CFI_FUNCTION_DECLS = 18,
   // Per-module summary that also adds relative block frequency to callee info.
   // PERMODULE_RELBF: [valueid, flags, instcount, numrefs,
   //                   numrefs x valueid,
   //                   n x (valueid, relblockfreq)]
   FS_PERMODULE_RELBF = 19,
   // Index-wide flags
   FS_FLAGS = 20,
+  // Maps type identifier to summary information for that type identifier.
+  // TYPE_ID: [typeid, kind, bitwidth, align, size, bitmask, inlinebits,
+  //           n x (typeid, kind, name, numrba,
+  //                numrba x (numarg, numarg x arg, kind, info, byte, bit))]
+  FS_TYPE_ID = 21,
 };
 
 enum MetadataCodes {
   METADATA_STRING_OLD = 1,     // MDSTRING:      [values]
   METADATA_VALUE = 2,          // VALUE:         [type num, value num]
   METADATA_NODE = 3,           // NODE:          [n x md num]
   METADATA_NAME = 4,           // STRING:        [values]
   METADATA_DISTINCT_NODE = 5,  // DISTINCT_NODE: [n x md num]

llvm/include/llvm/IR/ModuleSummaryIndex.h

private:
   /// name (may be duplicates in the COMDAT case, e.g.).
   GlobalValueSummaryMapTy GlobalValueMap;
 
   /// Holds strings for combined index, mapping to the corresponding module ID.
   ModulePathStringTableTy ModulePathStringTable;
 
   /// Mapping from type identifiers to summary information for that type
   /// identifier.
-  // FIXME: Add bitcode read/write support for this field.
   std::map<std::string, TypeIdSummary> TypeIdMap;
 
   /// Mapping from original ID to GUID. If original ID can map to multiple
   /// GUIDs, it will be mapped to 0.
   std::map<GlobalValue::GUID, GlobalValue::GUID> OidGuidMap;
 
   /// Indicates that summary-based GlobalValue GC has run, and values with
   /// GVFlags::Live==false are really dead. Otherwise, all values must be

llvm/lib/Bitcode/Reader/BitcodeReader.cpp

if (IsOldProfileFormat) {
       Hotness = static_cast<CalleeInfo::HotnessType>(Record[++I]);
     else if (HasRelBF)
       RelBF = Record[++I];
     Ret.push_back(FunctionSummary::EdgeTy{Callee, CalleeInfo(Hotness, RelBF)});
   }
   return Ret;
 }
 
+static void
+parseWholeProgramDevirtResolutionByArg(ArrayRef<uint64_t> Record, size_t &Slot,
+                                       WholeProgramDevirtResolution &Wpd) {
+  uint64_t ArgNum = Record[Slot++];
+  WholeProgramDevirtResolution::ByArg &B =
+      Wpd.ResByArg[{Record.begin() + Slot, Record.begin() + Slot + ArgNum}];
+  Slot += ArgNum;
+
+  B.TheKind =
+      static_cast<WholeProgramDevirtResolution::ByArg::Kind>(Record[Slot++]);
+  B.Info = Record[Slot++];
+  B.Byte = Record[Slot++];
+  B.Bit = Record[Slot++];
+}
+
+static void parseWholeProgramDevirtResolution(ArrayRef<uint64_t> Record,
+                                              StringRef Strtab, size_t &Slot,
+                                              TypeIdSummary &TypeId) {
+  uint64_t Id = Record[Slot++];
+  WholeProgramDevirtResolution &Wpd = TypeId.WPDRes[Id];
+
+  Wpd.TheKind = static_cast<WholeProgramDevirtResolution::Kind>(Record[Slot++]);
+  Wpd.SingleImplName = {Strtab.data() + Record[Slot],
+                        static_cast<size_t>(Record[Slot + 1])};
+  Slot += 2;
+
+  uint64_t ResByArgNum = Record[Slot++];
+  for (uint64_t I = 0; I != ResByArgNum; ++I)
+    parseWholeProgramDevirtResolutionByArg(Record, Slot, Wpd);
+}
+
+static void parseTypeIdSummaryRecord(ArrayRef<uint64_t> Record,
+                                     StringRef Strtab,
+                                     ModuleSummaryIndex &TheIndex) {
+  size_t Slot = 0;
+  TypeIdSummary &TypeId = TheIndex.getOrInsertTypeIdSummary(
+      {Strtab.data() + Record[Slot], static_cast<size_t>(Record[Slot + 1])});
+  Slot += 2;
+
+  TypeId.TTRes.TheKind = static_cast<TypeTestResolution::Kind>(Record[Slot++]);
+  TypeId.TTRes.SizeM1BitWidth = Record[Slot++];
+  TypeId.TTRes.AlignLog2 = Record[Slot++];
+  TypeId.TTRes.SizeM1 = Record[Slot++];
+  TypeId.TTRes.BitMask = Record[Slot++];
+  TypeId.TTRes.InlineBits = Record[Slot++];
+
+  while (Slot < Record.size())
+    parseWholeProgramDevirtResolution(Record, Strtab, Slot, TypeId);
+}
+
 // Eagerly parse the entire summary block. This populates the GlobalValueSummary
 // objects in the index.
 Error ModuleSummaryIndexBitcodeReader::parseEntireSummary(unsigned ID) {
   if (Stream.EnterSubBlock(ID))
     return error("Invalid record");
   SmallVector<uint64_t, 64> Record;
 
   // Parse version
while (true) {
 
     case bitc::FS_CFI_FUNCTION_DEFS: {
       std::set<std::string> &CfiFunctionDefs = TheIndex.cfiFunctionDefs();
       for (unsigned I = 0; I != Record.size(); I += 2)
         CfiFunctionDefs.insert(
             {Strtab.data() + Record[I], static_cast<size_t>(Record[I + 1])});
       break;
     }
+
     case bitc::FS_CFI_FUNCTION_DECLS: {
       std::set<std::string> &CfiFunctionDecls = TheIndex.cfiFunctionDecls();
       for (unsigned I = 0; I != Record.size(); I += 2)
         CfiFunctionDecls.insert(
             {Strtab.data() + Record[I], static_cast<size_t>(Record[I + 1])});
       break;
     }
+
+    case bitc::FS_TYPE_ID:
+      parseTypeIdSummaryRecord(Record, Strtab, TheIndex);
+      break;
     }
   }
   llvm_unreachable("Exit infinite loop");
 }
 
 // Parse the  module string table block into the Index.
 // This populates the ModulePathStringTable map in the index.
 Error ModuleSummaryIndexBitcodeReader::parseModuleStringTable() {

llvm/lib/Bitcode/Writer/BitcodeWriter.cpp

static void writeFunctionTypeMetadataRecords(BitstreamWriter &Stream,
   };
 
   WriteConstVCallVec(bitc::FS_TYPE_TEST_ASSUME_CONST_VCALL,
                      FS->type_test_assume_const_vcalls());
   WriteConstVCallVec(bitc::FS_TYPE_CHECKED_LOAD_CONST_VCALL,
                      FS->type_checked_load_const_vcalls());
 }
 
+static void writeWholeProgramDevirtResolutionByArg(
+    SmallVector<uint64_t, 64> &NameVals, const std::vector<uint64_t> &args,
+    const WholeProgramDevirtResolution::ByArg &ByArg) {
+  NameVals.push_back(args.size());
+  NameVals.insert(NameVals.end(), args.begin(), args.end());
+
+  NameVals.push_back(ByArg.TheKind);
+  NameVals.push_back(ByArg.Info);
+  NameVals.push_back(ByArg.Byte);
+  NameVals.push_back(ByArg.Bit);
+}
+
+static void writeWholeProgramDevirtResolution(
+    SmallVector<uint64_t, 64> &NameVals, StringTableBuilder &StrtabBuilder,
+    uint64_t Id, const WholeProgramDevirtResolution &Wpd) {
+  NameVals.push_back(Id);
+
+  NameVals.push_back(Wpd.TheKind);
+  NameVals.push_back(StrtabBuilder.add(Wpd.SingleImplName));
+  NameVals.push_back(Wpd.SingleImplName.size());
+
+  NameVals.push_back(Wpd.ResByArg.size());
+  for (auto &A : Wpd.ResByArg)
+    writeWholeProgramDevirtResolutionByArg(NameVals, A.first, A.second);
+}
+
+static void writeTypeIdSummaryRecord(SmallVector<uint64_t, 64> &NameVals,
+                                     StringTableBuilder &StrtabBuilder,
+                                     const std::string &Id,
+                                     const TypeIdSummary &Summary) {
+  NameVals.push_back(StrtabBuilder.add(Id));
+  NameVals.push_back(Id.size());
+
+  NameVals.push_back(Summary.TTRes.TheKind);
+  NameVals.push_back(Summary.TTRes.SizeM1BitWidth);
+  NameVals.push_back(Summary.TTRes.AlignLog2);
+  NameVals.push_back(Summary.TTRes.SizeM1);
+  NameVals.push_back(Summary.TTRes.BitMask);
+  NameVals.push_back(Summary.TTRes.InlineBits);
+
+  for (auto &W : Summary.WPDRes)
+    writeWholeProgramDevirtResolution(NameVals, StrtabBuilder, W.first,
+                                      W.second);
+}
+
 // Helper to emit a single function summary record.
 void ModuleBitcodeWriterBase::writePerModuleFunctionSummaryRecord(
     SmallVector<uint64_t, 64> &NameVals, GlobalValueSummary *Summary,
     unsigned ValueID, unsigned FSCallsAbbrev, unsigned FSCallsProfileAbbrev,
     const Function &F) {
   NameVals.push_back(ValueID);
 
   FunctionSummary *FS = cast<FunctionSummary>(Summary);
if (!Index.cfiFunctionDecls().empty()) {
     for (auto &S : Index.cfiFunctionDecls()) {
       NameVals.push_back(StrtabBuilder.add(S));
       NameVals.push_back(S.size());
     }
     Stream.EmitRecord(bitc::FS_CFI_FUNCTION_DECLS, NameVals);
     NameVals.clear();
   }
 
+  if (!Index.typeIds().empty()) {
+    for (auto &S : Index.typeIds()) {
+      writeTypeIdSummaryRecord(NameVals, StrtabBuilder, S.first, S.second);
+      Stream.EmitRecord(bitc::FS_TYPE_ID, NameVals);
+      NameVals.clear();
+    }
+  }
+
   Stream.ExitBlock();
 }
 
 /// Create the "IDENTIFICATION_BLOCK_ID" containing a single string with the
 /// current llvm version, and a record for the epoch number.
 static void writeIdentificationBlock(BitstreamWriter &Stream) {
   Stream.EnterSubblock(bitc::IDENTIFICATION_BLOCK_ID, 5);
 

llvm/test/ThinLTO/X86/cfi-icall.ll

 
 declare i1 @llvm.type.test(i8* %ptr, metadata %type) nounwind readnone
 
 !0 = !{i64 0, !"typeid1"}
 
 ; COMBINED:   <GLOBALVAL_SUMMARY_BLOCK
 ; COMBINED:     <CFI_FUNCTION_DEFS op0=0 op1=3/>
 ; COMBINED:     <CFI_FUNCTION_DECLS op0=3 op1=3/>
+; COMBINED:     <TYPE_ID op0=6 op1=7 op2=4 op3=7 op4=0 op5=0 op6=0 op7=0/>
 ; COMBINED:   </GLOBALVAL_SUMMARY_BLOCK>
 
 ; COMBINED:      <STRTAB_BLOCK
-; COMBINED-NEXT:   <BLOB abbrevid=4/> blob data = 'foobar'
+; COMBINED-NEXT:   <BLOB abbrevid=4/> blob data = 'foobartypeid1'
 ; COMBINED-NEXT: </STRTAB_BLOCK>

llvm/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp

default:
       STRINGIFY_CODE(FS, TYPE_TESTS)
       STRINGIFY_CODE(FS, TYPE_TEST_ASSUME_VCALLS)
       STRINGIFY_CODE(FS, TYPE_CHECKED_LOAD_VCALLS)
       STRINGIFY_CODE(FS, TYPE_TEST_ASSUME_CONST_VCALL)
       STRINGIFY_CODE(FS, TYPE_CHECKED_LOAD_CONST_VCALL)
       STRINGIFY_CODE(FS, VALUE_GUID)
       STRINGIFY_CODE(FS, CFI_FUNCTION_DEFS)
       STRINGIFY_CODE(FS, CFI_FUNCTION_DECLS)
+      STRINGIFY_CODE(FS, TYPE_ID)
     }
   case bitc::METADATA_ATTACHMENT_ID:
     switch(CodeID) {
     default:return nullptr;
       STRINGIFY_CODE(METADATA, ATTACHMENT)
     }
   case bitc::METADATA_BLOCK_ID:
     switch(CodeID) {