Revert "[Coverage] Refactor SIL generation for profiling"

include/swift/SIL/SILCoverageMap.h

@@ -73,9 +73,6 @@ class SILCoverageMap : public llvm::ilist_node<SILCoverageMap>,
   // Tail-allocated expression list.
   MutableArrayRef<llvm::coverage::CounterExpression> Expressions;
 
-  // Whether the coverage mapping's name data is in the profile symbol table.
-  bool HasSymtabEntry;
-
   // Disallow copying into temporary objects.
   SILCoverageMap(const SILCoverageMap &other) = delete;
   SILCoverageMap &operator=(const SILCoverageMap &) = delete;
@@ -111,14 +108,6 @@ class SILCoverageMap : public llvm::ilist_node<SILCoverageMap>,
     return Expressions;
   }
 
-  /// Check whether this coverage mapping can reference its name data within
-  /// the profile symbol table.
-  bool hasSymtabEntry() const { return HasSymtabEntry; }
-
-  /// Guarantee that this coverage mapping can reference its name data within
-  /// the profile symbol table.
-  void setSymtabEntryGuaranteed() { HasSymtabEntry = true; }
-
   void printCounter(llvm::raw_ostream &OS, llvm::coverage::Counter C) const;
 
   /// Print the coverage map.

include/swift/SIL/SILFunction.h

@@ -23,7 +23,6 @@
 #include "swift/SIL/SILDebugScope.h"
 #include "swift/SIL/SILLinkage.h"
 #include "swift/SIL/SILPrintContext.h"
-#include "swift/SIL/SILProfiler.h"
 #include "llvm/ADT/StringMap.h"
 
 /// The symbol name used for the program entry point function.
@@ -133,10 +132,6 @@ class SILFunction
   /// The source location and scope of the function.
   const SILDebugScope *DebugScope;
 
-  /// The profiler for instrumentation based profiling, or null if profiling is
-  /// disabled.
-  SILProfiler *Profiler = nullptr;
-
   /// The function's bare attribute. Bare means that the function is SIL-only
   /// and does not require debug info.
   unsigned Bare : 1;
@@ -256,24 +251,8 @@ class SILFunction
     return SILFunctionConventions(LoweredType, getModule());
   }
 
-  SILProfiler *getProfiler() const { return Profiler; }
-
-  void setProfiler(SILProfiler *InheritedProfiler) {
-    assert(!Profiler && "Function already has a profiler");
-    Profiler = InheritedProfiler;
-  }
-
-  void createProfiler(Decl *D) {
-    assert(!Profiler && "Function already has a profiler");
-    Profiler = SILProfiler::create(Module, D);
-  }
-
-  void discardProfiler() { Profiler = nullptr; }
-
   ProfileCounter getEntryCount() const { return EntryCount; }
 
-  void setEntryCount(ProfileCounter Count) { EntryCount = Count; }
-
   bool isNoReturnFunction() const;
 
   /// Unsafely rewrite the lowered type of this function.

include/swift/SIL/SILModule.h

@@ -42,7 +42,6 @@
 #include "llvm/ADT/PointerIntPair.h"
 #include "llvm/ADT/SetVector.h"
 #include "llvm/ADT/ilist.h"
-#include "llvm/ProfileData/InstrProfReader.h"
 #include "llvm/Support/Allocator.h"
 #include "llvm/Support/raw_ostream.h"
 #include <functional>
@@ -221,10 +220,7 @@ class SILModule {
   /// constructed. In certain cases this was before all Modules had been loaded
   /// causing us to not
   std::unique_ptr<SerializedSILLoader> SILLoader;
-
-  /// The indexed profile data to be used for PGO, or nullptr.
-  std::unique_ptr<llvm::IndexedInstrProfReader> PGOReader;
-
+
   /// True if this SILModule really contains the whole module, i.e.
   /// optimizations can assume that they see the whole module.
   bool wholeModule;
@@ -630,12 +626,6 @@ class SILModule {
     Stage = s;
   }
 
-  llvm::IndexedInstrProfReader *getPGOReader() const { return PGOReader.get(); }
-
-  void setPGOReader(std::unique_ptr<llvm::IndexedInstrProfReader> IPR) {
-    PGOReader = std::move(IPR);
-  }
-
   /// \brief Run the SIL verifier to make sure that all Functions follow
   /// invariants.
   void verify() const;

lib/IRGen/GenCoverage.cpp

@@ -43,15 +43,6 @@ void IRGenModule::emitCoverageMapping() {
   if (Mappings.empty())
     return;
 
-  assert(std::all_of(Mappings.begin(), Mappings.end(),
-                     [](const SILCoverageMap &M) {
-                       // TODO: We should use this check defensively s.t we
-                       // never emit malformed coverage data, instead of just
-                       // using it as a debugging tool.
-                       return M.hasSymtabEntry();
-                     }) &&
-         "Missing symtab entry for coverage mapping");
-
   std::vector<StringRef> Files;
   for (const auto &M : Mappings)
     if (std::find(Files.begin(), Files.end(), M.getFile()) == Files.end())

lib/SIL/CMakeLists.txt

@@ -27,7 +27,6 @@ add_swift_library(swiftSIL STATIC
   SILModule.cpp
   SILOpenedArchetypesTracker.cpp
   SILPrinter.cpp
-  SILProfiler.cpp
   SILSuccessor.cpp
   SILType.cpp
   SILValue.cpp

lib/SIL/SILCoverageMap.cpp

@@ -44,7 +44,7 @@ SILCoverageMap::create(SILModule &M, StringRef Filename, StringRef Name,
 }
 
 SILCoverageMap::SILCoverageMap(uint64_t Hash, bool External)
-    : External(External), Hash(Hash), HasSymtabEntry(false) {}
+    : External(External), Hash(Hash) {}
 
 SILCoverageMap::~SILCoverageMap() {}
 

lib/SILGen/CMakeLists.txt

@@ -27,6 +27,7 @@ add_swift_library(swiftSILGen STATIC
   SILGenMaterializeForSet.cpp
   SILGenPattern.cpp
   SILGenPoly.cpp
+  SILGenProfiling.cpp
   SILGenProlog.cpp
   SILGenStmt.cpp
   SILGenThunk.cpp