Temporarily revert r323062 to investigate buildbot failures

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@323065 91177308-0d34-0410-b5e6-96231b3b80d8

14 files changed, 31 insertions, 431 deletions

diff --git a/include/llvm/IR/ModuleSummaryIndex.h b/include/llvm/IR/ModuleSummaryIndex.h
index 17f8951bf0e..dd7a0db8377 100644
--- a/include/llvm/IR/ModuleSummaryIndex.h
+++ b/include/llvm/IR/ModuleSummaryIndex.h
@@ -69,27 +69,9 @@ class GlobalValueSummary;
 using GlobalValueSummaryList = std::vector<std::unique_ptr<GlobalValueSummary>>;
 
 struct GlobalValueSummaryInfo {
-  union NameOrGV {
-    NameOrGV(bool IsAnalysis) {
-      if (IsAnalysis)
-        GV = nullptr;
-      else
-        Name = "";
-    }
-
-    /// The GlobalValue corresponding to this summary. This is only used in
-    /// per-module summaries, when module analysis is being run.
-    const GlobalValue *GV;
-
-    /// Summary string representation. This StringRef points to BC module
-    /// string table and is valid until module data is stored in memory.
-    /// This is guaranteed to happen until runThinLTOBackend function is
-    /// called, so it is safe to use this field during thin link. This field
-    /// is only valid if summary index was loaded from BC file.
-    StringRef Name;
-  } U;
-
-  GlobalValueSummaryInfo(bool IsAnalysis) : U(IsAnalysis) {}
+  /// The GlobalValue corresponding to this summary. This is only used in
+  /// per-module summaries.
+  const GlobalValue *GV = nullptr;
 
   /// List of global value summary structures for a particular value held
   /// in the GlobalValueMap. Requires a vector in the case of multiple
@@ -109,60 +91,32 @@ using GlobalValueSummaryMapTy =
 /// Struct that holds a reference to a particular GUID in a global value
 /// summary.
 struct ValueInfo {
-  PointerIntPair<const GlobalValueSummaryMapTy::value_type *, 1, bool>
-      RefAndFlag;
+  const GlobalValueSummaryMapTy::value_type *Ref = nullptr;
 
   ValueInfo() = default;
-  ValueInfo(bool IsAnalysis, const GlobalValueSummaryMapTy::value_type *R) {
-    RefAndFlag.setPointer(R);
-    RefAndFlag.setInt(IsAnalysis);
-  }
+  ValueInfo(const GlobalValueSummaryMapTy::value_type *Ref) : Ref(Ref) {}
 
-  operator bool() const { return getRef(); }
+  operator bool() const { return Ref; }
 
-  GlobalValue::GUID getGUID() const { return getRef()->first; }
-  const GlobalValue *getValue() const {
-    assert(isFromAnalysis());
-    return getRef()->second.U.GV;
-  }
+  GlobalValue::GUID getGUID() const { return Ref->first; }
+  const GlobalValue *getValue() const { return Ref->second.GV; }
 
   ArrayRef<std::unique_ptr<GlobalValueSummary>> getSummaryList() const {
-    return getRef()->second.SummaryList;
-  }
-
-  StringRef name() const {
-    return isFromAnalysis() ? getRef()->second.U.GV->getName()
-                            : getRef()->second.U.Name;
-  }
-
-  bool isFromAnalysis() const { return RefAndFlag.getInt(); }
-
-  const GlobalValueSummaryMapTy::value_type *getRef() const {
-    return RefAndFlag.getPointer();
+    return Ref->second.SummaryList;
   }
 };
 
 template <> struct DenseMapInfo<ValueInfo> {
   static inline ValueInfo getEmptyKey() {
-    return ValueInfo(false, (GlobalValueSummaryMapTy::value_type *)-8);
+    return ValueInfo((GlobalValueSummaryMapTy::value_type *)-1);
   }
 
   static inline ValueInfo getTombstoneKey() {
-    return ValueInfo(false, (GlobalValueSummaryMapTy::value_type *)-16);
-  }
-
-  static inline bool isSpecialKey(ValueInfo V) {
-    return V == getTombstoneKey() || V == getEmptyKey();
+    return ValueInfo((GlobalValueSummaryMapTy::value_type *)-2);
   }
 
-  static bool isEqual(ValueInfo L, ValueInfo R) {
-    // We are not supposed to mix ValueInfo(s) with different analysis flag
-    // in a same container.
-    assert(isSpecialKey(L) || isSpecialKey(R) ||
-           (L.isFromAnalysis() == R.isFromAnalysis()));
-    return L.getRef() == R.getRef();
-  }
-  static unsigned getHashValue(ValueInfo I) { return (uintptr_t)I.getRef(); }
+  static bool isEqual(ValueInfo L, ValueInfo R) { return L.Ref == R.Ref; }
+  static unsigned getHashValue(ValueInfo I) { return (uintptr_t)I.Ref; }
 };
 
 /// \brief Function and variable summary information to aid decisions and
@@ -665,11 +619,6 @@ private:
   /// considered live.
   bool WithGlobalValueDeadStripping = false;
 
-  /// If true then we're performing analysis of IR module, filling summary
-  /// accordingly. The value of 'false' means we're reading summary from
-  /// BC or YAML source. Affects the type of value stored in NameOrGV union
-  bool IsAnalysis;
-
   std::set<std::string> CfiFunctionDefs;
   std::set<std::string> CfiFunctionDecls;
 
@@ -678,16 +627,10 @@ private:
 
   GlobalValueSummaryMapTy::value_type *
   getOrInsertValuePtr(GlobalValue::GUID GUID) {
-    return &*GlobalValueMap.emplace(GUID, GlobalValueSummaryInfo(IsAnalysis)).first;
+    return &*GlobalValueMap.emplace(GUID, GlobalValueSummaryInfo{}).first;
   }
 
 public:
-  // See IsAnalysis variable comment.
-  ModuleSummaryIndex(bool IsPerformingAnalysis)
-      : IsAnalysis(IsPerformingAnalysis) {}
-
-  bool isPerformingAnalysis() const { return IsAnalysis; }
-
   gvsummary_iterator begin() { return GlobalValueMap.begin(); }
   const_gvsummary_iterator begin() const { return GlobalValueMap.begin(); }
   gvsummary_iterator end() { return GlobalValueMap.end(); }
@@ -709,28 +652,19 @@ public:
   /// Return a ValueInfo for GUID if it exists, otherwise return ValueInfo().
   ValueInfo getValueInfo(GlobalValue::GUID GUID) const {
     auto I = GlobalValueMap.find(GUID);
-    return ValueInfo(IsAnalysis, I == GlobalValueMap.end() ? nullptr : &*I);
+    return ValueInfo(I == GlobalValueMap.end() ? nullptr : &*I);
   }
 
   /// Return a ValueInfo for \p GUID.
   ValueInfo getOrInsertValueInfo(GlobalValue::GUID GUID) {
-    return ValueInfo(IsAnalysis, getOrInsertValuePtr(GUID));
-  }
-
-  /// Return a ValueInfo for \p GUID setting value \p Name. 
-  ValueInfo getOrInsertValueInfo(GlobalValue::GUID GUID, StringRef Name) {
-    assert(!IsAnalysis);
-    auto VP = getOrInsertValuePtr(GUID);
-    VP->second.U.Name = Name;
-    return ValueInfo(IsAnalysis, VP);
+    return ValueInfo(getOrInsertValuePtr(GUID));
   }
 
   /// Return a ValueInfo for \p GV and mark it as belonging to GV.
   ValueInfo getOrInsertValueInfo(const GlobalValue *GV) {
-    assert(IsAnalysis);
     auto VP = getOrInsertValuePtr(GV->getGUID());
-    VP->second.U.GV = GV;
-    return ValueInfo(IsAnalysis, VP);
+    VP->second.GV = GV;
+    return ValueInfo(VP);
   }
 
   /// Return the GUID for \p OriginalId in the OidGuidMap.
@@ -758,7 +692,7 @@ public:
     addOriginalName(VI.getGUID(), Summary->getOriginalName());
     // Here we have a notionally const VI, but the value it points to is owned
     // by the non-const *this.
-    const_cast<GlobalValueSummaryMapTy::value_type *>(VI.getRef())
+    const_cast<GlobalValueSummaryMapTy::value_type *>(VI.Ref)
         ->second.SummaryList.push_back(std::move(Summary));
   }
 
@@ -889,9 +823,6 @@ public:
   /// Summary).
   void collectDefinedGVSummariesPerModule(
       StringMap<GVSummaryMapTy> &ModuleToDefinedGVSummaries) const;
-
-  /// Export summary to dot file for GraphViz.
-  void exportToDot(raw_ostream& OS) const;
 };
 
 } // end namespace llvm
diff --git a/include/llvm/IR/ModuleSummaryIndexYAML.h b/include/llvm/IR/ModuleSummaryIndexYAML.h
index 241f106a4d4..4687f2d53e7 100644
--- a/include/llvm/IR/ModuleSummaryIndexYAML.h
+++ b/include/llvm/IR/ModuleSummaryIndexYAML.h
@@ -207,8 +207,7 @@ template <> struct CustomMappingTraits<GlobalValueSummaryMapTy> {
       io.setError("key not an integer");
       return;
     }
-    auto P = V.emplace(KeyInt, /*IsAnalysis=*/false);
-    auto &Elem = (*P.first).second;
+    auto &Elem = V[KeyInt];
     for (auto &FSum : FSums) {
       Elem.SummaryList.push_back(llvm::make_unique<FunctionSummary>(
           GlobalValueSummary::GVFlags(
diff --git a/lib/Analysis/ModuleSummaryAnalysis.cpp b/lib/Analysis/ModuleSummaryAnalysis.cpp
index cf2fe7776dd..efa5bd564ad 100644
--- a/lib/Analysis/ModuleSummaryAnalysis.cpp
+++ b/lib/Analysis/ModuleSummaryAnalysis.cpp
@@ -372,7 +372,7 @@ ModuleSummaryIndex llvm::buildModuleSummaryIndex(
     std::function<BlockFrequencyInfo *(const Function &F)> GetBFICallback,
     ProfileSummaryInfo *PSI) {
   assert(PSI);
-  ModuleSummaryIndex Index(/*IsPerformingAnalysis=*/true);
+  ModuleSummaryIndex Index;
 
   // Identify the local values in the llvm.used and llvm.compiler.used sets,
   // which should not be exported as they would then require renaming and
diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp
index 7ffa6248879..1b029bf8885 100644
--- a/lib/Bitcode/Reader/BitcodeReader.cpp
+++ b/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -4813,12 +4813,8 @@ void ModuleSummaryIndexBitcodeReader::setValueGUID(
   if (PrintSummaryGUIDs)
     dbgs() << "GUID " << ValueGUID << "(" << OriginalNameID << ") is "
            << ValueName << "\n";
-  
-  // UseStrtab is false for legacy summary formats and value names are
-  // created on stack. We can't use them outside of parseValueSymbolTable.
-  ValueIdToValueInfoMap[ValueID] = std::make_pair(
-      TheIndex.getOrInsertValueInfo(ValueGUID, UseStrtab ? ValueName : ""),
-      OriginalNameID);
+  ValueIdToValueInfoMap[ValueID] =
+      std::make_pair(TheIndex.getOrInsertValueInfo(ValueGUID), OriginalNameID);
 }
 
 // Specialized value symbol table parser used when reading module index
@@ -5683,8 +5679,7 @@ Expected<std::unique_ptr<ModuleSummaryIndex>> BitcodeModule::getSummary() {
   BitstreamCursor Stream(Buffer);
   Stream.JumpToBit(ModuleBit);
 
-  auto Index =
-      llvm::make_unique<ModuleSummaryIndex>(/*IsPerformingAnalysis=*/false);
+  auto Index = llvm::make_unique<ModuleSummaryIndex>();
   ModuleSummaryIndexBitcodeReader R(std::move(Stream), Strtab, *Index,
                                     ModuleIdentifier, 0);
 
diff --git a/lib/IR/ModuleSummaryIndex.cpp b/lib/IR/ModuleSummaryIndex.cpp
index a0b963e7af3..51c4bae3332 100644
--- a/lib/IR/ModuleSummaryIndex.cpp
+++ b/lib/IR/ModuleSummaryIndex.cpp
@@ -14,7 +14,6 @@
 
 #include "llvm/IR/ModuleSummaryIndex.h"
 #include "llvm/ADT/StringMap.h"
-#include "llvm/Support/Path.h"
 using namespace llvm;
 
 // Collect for the given module the list of function it defines
@@ -70,246 +69,3 @@ bool ModuleSummaryIndex::isGUIDLive(GlobalValue::GUID GUID) const {
       return true;
   return false;
 }
-
-namespace {
-struct Attributes {
-  void add(const Twine &Name, const Twine &Value,
-           const Twine &Comment = Twine());
-  std::string getAsString() const;
-
-  std::vector<std::string> Attrs;
-  std::string Comments;
-};
-
-struct Edge {
-  uint64_t SrcMod;
-  int Hotness;
-  GlobalValue::GUID Src;
-  GlobalValue::GUID Dst;
-};
-}
-
-void Attributes::add(const Twine &Name, const Twine &Value,
-                     const Twine &Comment) {
-  std::string A = Name.str();
-  A += "=\"";
-  A += Value.str();
-  A += "\"";
-  Attrs.push_back(A);
-  if (!Comment.isTriviallyEmpty()) {
-    if (Comments.empty())
-      Comments = " // ";
-    else
-      Comments += ", ";
-    Comments += Comment.str();
-  }
-}
-
-std::string Attributes::getAsString() const {
-  if (Attrs.empty())
-    return "";
-
-  std::string Ret = "[";
-  for (auto &A : Attrs)
-    Ret += A + ",";
-  Ret.pop_back();
-  Ret += "];";
-  Ret += Comments;
-  return Ret;
-}
-
-static std::string linkageToString(GlobalValue::LinkageTypes LT) {
-  switch (LT) {
-  case GlobalValue::ExternalLinkage:
-    return "extern";
-  case GlobalValue::AvailableExternallyLinkage:
-    return "av_ext";
-  case GlobalValue::LinkOnceAnyLinkage:
-    return "linkonce";
-  case GlobalValue::LinkOnceODRLinkage:
-    return "linkonce_odr";
-  case GlobalValue::WeakAnyLinkage:
-    return "weak";
-  case GlobalValue::WeakODRLinkage:
-    return "weak_odr";
-  case GlobalValue::AppendingLinkage:
-    return "appending";
-  case GlobalValue::InternalLinkage:
-    return "internal";
-  case GlobalValue::PrivateLinkage:
-    return "private";
-  case GlobalValue::ExternalWeakLinkage:
-    return "extern_weak";
-  case GlobalValue::CommonLinkage:
-    return "common";
-  }
-
-  return "<unknown>";
-}
-
-static std::string fflagsToString(FunctionSummary::FFlags F) {
-  auto FlagValue = [](unsigned V) { return V ? '1' : '0'; };
-  char FlagRep[] = {FlagValue(F.ReadNone), FlagValue(F.ReadOnly),
-                    FlagValue(F.NoRecurse), FlagValue(F.ReturnDoesNotAlias), 0};
-
-  return FlagRep;
-}
-
-// Get string representation of function instruction count and flags.
-static std::string getSummaryAttributes(GlobalValueSummary* GVS) {
-  auto *FS = dyn_cast_or_null<FunctionSummary>(GVS);
-  if (!FS)
-    return "";
-
-  return std::string("inst: ") + std::to_string(FS->instCount()) +
-         ", ffl: " + fflagsToString(FS->fflags());
-}
-
-static std::string getNodeVisualName(const ValueInfo &VI) {
-  return VI.name().empty() ? std::string("@") + std::to_string(VI.getGUID())
-                           : VI.name().str();
-}
-
-static std::string getNodeLabel(const ValueInfo &VI, GlobalValueSummary *GVS) {
-  if (isa<AliasSummary>(GVS))
-    return getNodeVisualName(VI);
-
-  std::string Attrs = getSummaryAttributes(GVS);
-  std::string Label =
-      getNodeVisualName(VI) + "|" + linkageToString(GVS->linkage());
-  if (!Attrs.empty())
-    Label += std::string(" (") + Attrs + ")";
-  Label += "}";
-
-  return Label;
-}
-
-// Write definition of external node, which doesn't have any
-// specific module associated with it. Typically this is function
-// or variable defined in native object or library.
-static void defineExternalNode(raw_ostream &OS, const char *Pfx,
-                               const ValueInfo &VI) {
-  auto StrId = std::to_string(VI.getGUID());
-  OS << "  " << StrId << " [label=\"" << getNodeVisualName(VI)
-     << "\"]; // defined externally\n";
-}
-
-void ModuleSummaryIndex::exportToDot(raw_ostream& OS) const {
-  std::vector<Edge> CrossModuleEdges;
-  DenseMap<GlobalValue::GUID, std::vector<uint64_t>> NodeMap;
-  StringMap<GVSummaryMapTy> ModuleToDefinedGVS;
-  collectDefinedGVSummariesPerModule(ModuleToDefinedGVS);
-
-  // Get node identifier in form MXXX_<GUID>. The MXXX prefix is required,
-  // because we may have multiple linkonce functions summaries.
-  auto NodeId = [](uint64_t ModId, GlobalValue::GUID Id) {
-    return ModId == (uint64_t)-1 ? std::to_string(Id)
-                                 : std::string("M") + std::to_string(ModId) +
-                                       "_" + std::to_string(Id);
-  };
-
-  auto DrawEdge = [&](const char *Pfx, int SrcMod, GlobalValue::GUID SrcId,
-                      int DstMod, GlobalValue::GUID DstId, int TypeOrHotness) {
-    // 0 corresponds to alias edge, 1 to ref edge, 2 to call with unknown
-    // hotness, ...
-    TypeOrHotness += 2;
-    static const char *EdgeAttrs[] = {
-        " [style=dotted]; // alias",
-        " [style=dashed]; // ref",
-        " // call (hotness : Unknown)",
-        " [color=blue]; // call (hotness : Cold)",
-        " // call (hotness : None)",
-        " [color=brown]; // call (hotness : Hot)",
-        " [style=bold,color=red]; // call (hotness : Critical)"};
-
-    assert(static_cast<size_t>(TypeOrHotness) <
-           sizeof(EdgeAttrs) / sizeof(EdgeAttrs[0]));
-    OS << Pfx << NodeId(SrcMod, SrcId) << " -> " << NodeId(DstMod, DstId)
-       << EdgeAttrs[TypeOrHotness] << "\n";
-  };
-
-  OS << "digraph Summary {\n";
-  for (auto &ModIt : ModuleToDefinedGVS) {
-    auto ModId = getModuleId(ModIt.first());
-    OS << "  // Module: " << ModIt.first() << "\n";
-    OS << "  subgraph cluster_" << std::to_string(ModId) << " {\n";
-    OS << "    style = filled;\n";
-    OS << "    color = lightgrey;\n";
-    OS << "    label = \"" << sys::path::filename(ModIt.first()) << "\";\n";
-    OS << "    node [style=filled,fillcolor=lightblue];\n";
-
-    auto &GVSMap = ModIt.second;
-    auto Draw = [&](GlobalValue::GUID IdFrom, GlobalValue::GUID IdTo, int Hotness) {
-      if (!GVSMap.count(IdTo)) {
-        CrossModuleEdges.push_back({ModId, Hotness, IdFrom, IdTo});
-        return;
-      }
-      DrawEdge("    ", ModId, IdFrom, ModId, IdTo, Hotness);
-    };
-
-    for (auto &SummaryIt : GVSMap) {
-      NodeMap[SummaryIt.first].push_back(ModId);
-      auto Flags = SummaryIt.second->flags();
-      Attributes A;
-      if (isa<FunctionSummary>(SummaryIt.second)) {
-        A.add("shape", "record", "function");
-      } else if (isa<AliasSummary>(SummaryIt.second)) {
-        A.add("style", "dotted,filled", "alias");
-        A.add("shape", "box");
-      } else {
-        A.add("shape", "Mrecord", "variable");
-      }
-
-      auto VI = getValueInfo(SummaryIt.first);
-      A.add("label", getNodeLabel(VI, SummaryIt.second));
-      if (!Flags.Live)
-        A.add("fillcolor", "red", "dead");
-      else if (Flags.NotEligibleToImport)
-        A.add("fillcolor", "yellow", "not eligible to import");
-
-      OS << "    " << NodeId(ModId, SummaryIt.first) << " " << A.getAsString()
-         << "\n";
-    }
-    OS << "    // Edges:\n";
-
-    for (auto &SummaryIt : GVSMap) {
-      auto *GVS = SummaryIt.second;
-      for (auto &R : GVS->refs())
-        Draw(SummaryIt.first, R.getGUID(), -1);
-
-      if (auto *AS = dyn_cast_or_null<AliasSummary>(SummaryIt.second)) {
-        auto AliaseeOrigId = AS->getAliasee().getOriginalName();
-        auto AliaseeId = getGUIDFromOriginalID(AliaseeOrigId);
-
-        Draw(SummaryIt.first, AliaseeId ? AliaseeId : AliaseeOrigId, -2);
-        continue;
-      }
-
-      if (auto *FS = dyn_cast_or_null<FunctionSummary>(SummaryIt.second))
-        for (auto &CGEdge : FS->calls())
-          Draw(SummaryIt.first, CGEdge.first.getGUID(),
-               static_cast<int>(CGEdge.second.Hotness));
-    }
-    OS << "  }\n";
-  }
-
-  for (auto &E : CrossModuleEdges) {
-    auto &ModList = NodeMap[E.Dst];
-    if (ModList.empty()) {
-      defineExternalNode(OS, "  ", getValueInfo(E.Dst));
-      // Add fake module to the list to draw an edge to an external node
-      // in the loop below.
-      ModList.push_back(-1);
-    }
-    for (auto DstMod : ModList)
-      // The edge representing call or ref is drawn to every module where target
-      // symbol is defined. When target is a linkonce symbol there can be
-      // multiple edges representing a single call or ref, both intra-module and
-      // cross-module. As we've already drawn all intra-module edges before we
-      // skip it here.
-      if (DstMod != E.SrcMod)
-        DrawEdge("  ", E.SrcMod, E.Src, DstMod, E.Dst, E.Hotness);
-  }
-
-  OS << "}";
-}
diff --git a/lib/LTO/LTO.cpp b/lib/LTO/LTO.cpp
index 69d46a594d3..a36d640ba9e 100644
--- a/lib/LTO/LTO.cpp
+++ b/lib/LTO/LTO.cpp
@@ -388,8 +388,7 @@ LTO::RegularLTOState::RegularLTOState(unsigned ParallelCodeGenParallelismLevel,
       Ctx(Conf), CombinedModule(llvm::make_unique<Module>("ld-temp.o", Ctx)),
       Mover(llvm::make_unique<IRMover>(*CombinedModule)) {}
 
-LTO::ThinLTOState::ThinLTOState(ThinBackend Backend)
-    : Backend(Backend), CombinedIndex(/*IsPeformingAnalysis*/ false) {
+LTO::ThinLTOState::ThinLTOState(ThinBackend Backend) : Backend(Backend) {
   if (!Backend)
     this->Backend =
         createInProcessThinBackend(llvm::heavyweight_hardware_concurrency());
diff --git a/lib/LTO/LTOBackend.cpp b/lib/LTO/LTOBackend.cpp
index 07053267750..501d6284117 100644
--- a/lib/LTO/LTOBackend.cpp
+++ b/lib/LTO/LTOBackend.cpp
@@ -103,12 +103,6 @@ Error Config::addSaveTemps(std::string OutputFileName,
     if (EC)
       reportOpenError(Path, EC.message());
     WriteIndexToFile(Index, OS);
-
-    Path = OutputFileName + "index.dot";
-    raw_fd_ostream OSDot(Path, EC, sys::fs::OpenFlags::F_None);
-    if (EC)
-      reportOpenError(Path, EC.message());
-    Index.exportToDot(OSDot);
     return true;
   };
 
diff --git a/lib/LTO/ThinLTOCodeGenerator.cpp b/lib/LTO/ThinLTOCodeGenerator.cpp
index b5ac5a77e9c..692396eac20 100644
--- a/lib/LTO/ThinLTOCodeGenerator.cpp
+++ b/lib/LTO/ThinLTOCodeGenerator.cpp
@@ -592,7 +592,7 @@ std::unique_ptr<TargetMachine> TargetMachineBuilder::create() const {
  */
 std::unique_ptr<ModuleSummaryIndex> ThinLTOCodeGenerator::linkCombinedIndex() {
   std::unique_ptr<ModuleSummaryIndex> CombinedIndex =
-      llvm::make_unique<ModuleSummaryIndex>(/*IsPeformingAnalysis=*/false);
+      llvm::make_unique<ModuleSummaryIndex>();
   uint64_t NextModuleId = 0;
   for (auto &ModuleBuffer : Modules) {
     if (Error Err = readModuleSummaryIndex(ModuleBuffer.getMemBuffer(),
diff --git a/lib/Transforms/IPO/FunctionImport.cpp b/lib/Transforms/IPO/FunctionImport.cpp
index b1eefb96454..b6d6201cd23 100644
--- a/lib/Transforms/IPO/FunctionImport.cpp
+++ b/lib/Transforms/IPO/FunctionImport.cpp
@@ -231,7 +231,7 @@ updateValueInfoForIndirectCalls(const ModuleSummaryIndex &Index, ValueInfo VI) {
   // it, rather than needing to perform this mapping on each walk.
   auto GUID = Index.getGUIDFromOriginalID(VI.getGUID());
   if (GUID == 0)
-    return ValueInfo();
+    return nullptr;
   return Index.getValueInfo(GUID);
 }
 
@@ -517,7 +517,7 @@ void llvm::computeDeadSymbols(
     for (auto &S : Entry.second.SummaryList)
       if (S->isLive()) {
         DEBUG(dbgs() << "Live root: " << Entry.first << "\n");
-        Worklist.push_back(ValueInfo(/*IsAnalysis=*/false, &Entry));
+        Worklist.push_back(ValueInfo(&Entry));
         ++LiveSymbols;
         break;
       }
diff --git a/lib/Transforms/IPO/LowerTypeTests.cpp b/lib/Transforms/IPO/LowerTypeTests.cpp
index 5dd9fd35e30..20f54ef53f7 100644
--- a/lib/Transforms/IPO/LowerTypeTests.cpp
+++ b/lib/Transforms/IPO/LowerTypeTests.cpp
@@ -1529,7 +1529,7 @@ LowerTypeTestsModule::LowerTypeTestsModule(
 }
 
 bool LowerTypeTestsModule::runForTesting(Module &M) {
-  ModuleSummaryIndex Summary(/*IsPerformingAnalysis=*/false);
+  ModuleSummaryIndex Summary;
 
   // Handle the command-line summary arguments. This code is for testing
   // purposes only, so we handle errors directly.
diff --git a/lib/Transforms/IPO/WholeProgramDevirt.cpp b/lib/Transforms/IPO/WholeProgramDevirt.cpp
index aa1755bb097..8c7eb48f2ff 100644
--- a/lib/Transforms/IPO/WholeProgramDevirt.cpp
+++ b/lib/Transforms/IPO/WholeProgramDevirt.cpp
@@ -584,7 +584,7 @@ PreservedAnalyses WholeProgramDevirtPass::run(Module &M,
 bool DevirtModule::runForTesting(
     Module &M, function_ref<AAResults &(Function &)> AARGetter,
     function_ref<OptimizationRemarkEmitter &(Function *)> OREGetter) {
-  ModuleSummaryIndex Summary(/*IsPerformingAnalysis=*/false);
+  ModuleSummaryIndex Summary;
 
   // Handle the command-line summary arguments. This code is for testing
   // purposes only, so we handle errors directly.
diff --git a/test/ThinLTO/X86/Inputs/dot-dumper.ll b/test/ThinLTO/X86/Inputs/dot-dumper.ll
deleted file mode 100644
index d149de2a96f..00000000000
--- a/test/ThinLTO/X86/Inputs/dot-dumper.ll
+++ /dev/null
@@ -1,20 +0,0 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-unknown-linux-gnu"
-
-@A = local_unnamed_addr global i32 10, align 4
-@B = local_unnamed_addr global i32 20, align 4
-
-; Function Attrs: norecurse nounwind readonly uwtable
-define i32 @foo() local_unnamed_addr #0 {
-  %1 = load i32, i32* @B, align 4
-  %2 = load i32, i32* @A, align 4
-  %3 = add nsw i32 %2, %1
-  ret i32 %3
-}
-
-; Function Attrs: norecurse nounwind readnone uwtable
-define i32 @bar() local_unnamed_addr {
-  ret i32 42
-}
-
-attributes #0 = { noinline }
diff --git a/test/ThinLTO/X86/dot-dumper.ll b/test/ThinLTO/X86/dot-dumper.ll
deleted file mode 100644
index e19b540d7e3..00000000000
--- a/test/ThinLTO/X86/dot-dumper.ll
+++ /dev/null
@@ -1,54 +0,0 @@
-; RUN: opt -module-summary %s -o %t1.bc
-; RUN: opt -module-summary %p/Inputs/dot-dumper.ll -o %t2.bc
-; RUN: llvm-lto2 run -save-temps %t1.bc %t2.bc -o %t3 \
-; RUN:  -r=%t1.bc,main,px \
-; RUN:  -r=%t1.bc,main_alias,p \
-; RUN:  -r=%t1.bc,foo, \
-; RUN:  -r=%t1.bc,A, \
-; RUN:  -r=%t2.bc,foo,p \
-; RUN:  -r=%t2.bc,bar,p \
-; RUN:  -r=%t2.bc,A,p \
-; RUN:  -r=%t2.bc,B,p
-; RUN: cat %t3.index.dot | FileCheck %s
-
-; CHECK:        digraph Summary
-; CHECK-NEXT:      Module:
-
-; CHECK-LABEL:     subgraph cluster_0
-; Node definitions can appear in any order, but they should go before edge list.
-; CHECK:             M0_[[MAIN_ALIAS:[0-9]+]] [{{.*}}main_alias{{.*}}]; // alias, dead
-; CHECK:             M0_[[MAIN:[0-9]+]] [{{.*}}main|extern{{.*}}]; // function
-; CHECK:             // Edges:
-; CHECK-NEXT:        M0_[[MAIN_ALIAS]] -> M0_[[MAIN]] [{{.*}}]; // alias
-
-; CHECK-LABEL:     subgraph cluster_1 {
-; CHECK:             M1_[[A:[0-9]+]] [{{.*}}A|extern{{.*}}]; // variable
-
-; CHECK:             M1_[[FOO:[0-9]+]] [{{.*}}foo|extern{{.*}}]; // function, not eligible to import
-; CHECK:             M1_[[B:[0-9]+]] [{{.*}}B|extern{{.*}}]; // variable
-; CHECK:             M1_[[BAR:[0-9]+]] [{{.*}}bar|extern{{.*}}]; // function, dead
-; CHECK:             Edges:
-
-; Order of edges in dot file is undefined
-; CHECK:             M1_[[FOO]] -> M1_[[B]] [{{.*}}]; // ref
-; CHECK:             M1_[[FOO]] -> M1_[[A]] [{{.*}}]; // ref
-; CHECK:           }
-
-; Cross-module edges
-; CHECK:           M0_[[MAIN]] -> M1_[[A]] [{{.*}}]; // ref
-; CHECK:           M0_[[MAIN]] -> M1_[[FOO]] // call
-
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-unknown-linux-gnu"
-
-@A = external local_unnamed_addr global i32, align 4
-
-; Function Attrs: nounwind uwtable
-define i32 @main() local_unnamed_addr {
-  %1 = tail call i32 (...) @foo()
-  %2 = load i32, i32* @A, align 4
-  %3 = add nsw i32 %2, %1
-  ret i32 %3
-}
-@main_alias = weak_odr alias i32 (), i32 ()* @main
-declare i32 @foo(...) local_unnamed_addr
diff --git a/tools/llvm-lto/llvm-lto.cpp b/tools/llvm-lto/llvm-lto.cpp
index c536f62833b..7d71a3e8dfe 100644
--- a/tools/llvm-lto/llvm-lto.cpp
+++ b/tools/llvm-lto/llvm-lto.cpp
@@ -367,7 +367,7 @@ static void listSymbols(const TargetOptions &Options) {
 /// This is meant to enable testing of ThinLTO combined index generation,
 /// currently available via the gold plugin via -thinlto.
 static void createCombinedModuleSummaryIndex() {
-  ModuleSummaryIndex CombinedIndex(/*IsPerformingAnalysis=*/false);
+  ModuleSummaryIndex CombinedIndex;
   uint64_t NextModuleId = 0;
   for (auto &Filename : InputFilenames) {
     ExitOnError ExitOnErr("llvm-lto: error loading file '" + Filename + "': ");