[SILGen] Avoid forcing function bodies for profiling

This is no longer necessary now that we ensure we
always SILGen functions that contain user code.

Author: hamishknight

include/swift/SIL/SILProfiler.h

@@ -31,9 +31,6 @@ class SILCoverageMap;
 class SILFunction;
 class SILModule;
 
-/// Returns whether the given AST node requires profiling instrumentation.
-bool doesASTRequireProfiling(SILModule &M, ASTNode N, SILDeclRef Constant);
-
 /// SILProfiler - Maps AST nodes to profile counters.
 class SILProfiler : public SILAllocated<SILProfiler> {
 private:

lib/SIL/IR/SILProfiler.cpp

@@ -98,17 +98,6 @@ static bool shouldProfile(ASTNode N, SILDeclRef Constant) {
   return true;
 }
 
-namespace swift {
-bool doesASTRequireProfiling(SILModule &M, ASTNode N, SILDeclRef Constant) {
-  // If profiling isn't enabled, don't profile anything.
-  auto &Opts = M.getOptions();
-  if (Opts.UseProfile.empty() && !Opts.GenerateProfile)
-    return false;
-
-  return shouldProfile(N, Constant);
-}
-} // namespace swift
-
 /// Get the DeclContext for the decl referenced by \p forDecl.
 DeclContext *getProfilerContextForDecl(ASTNode N, SILDeclRef forDecl) {
   if (auto *D = N.dyn_cast<Decl *>())
@@ -159,8 +148,12 @@ static bool canCreateProfilerForAST(ASTNode N, SILDeclRef forDecl) {
 }
 
 SILProfiler *SILProfiler::create(SILModule &M, ASTNode N, SILDeclRef Ref) {
+  // If profiling isn't enabled, don't profile anything.
   const auto &Opts = M.getOptions();
-  if (!doesASTRequireProfiling(M, N, Ref))
+  if (!Opts.GenerateProfile && Opts.UseProfile.empty())
+    return nullptr;
+
+  if (!shouldProfile(N, Ref))
     return nullptr;
 
   if (!canCreateProfilerForAST(N, Ref)) {

lib/SILGen/SILGen.cpp

@@ -1173,24 +1173,20 @@ void SILGenModule::emitFunctionDefinition(SILDeclRef constant, SILFunction *f) {
 
 /// Emit a function now, if it's externally usable or has been referenced in
 /// the current TU, or remember how to emit it later if not.
-static void emitOrDelayFunction(SILGenModule &SGM,
-                                SILDeclRef constant,
-                                bool forceEmission = false) {
+static void emitOrDelayFunction(SILGenModule &SGM, SILDeclRef constant) {
   assert(!constant.isThunk());
   assert(!constant.isClangImported());
 
   auto emitAfter = SGM.lastEmittedFunction;
 
-  SILFunction *f = nullptr;
-
   // Implicit decls may be delayed if they can't be used externally.
   auto linkage = constant.getLinkage(ForDefinition);
-  bool mayDelay = !forceEmission &&
-             (!constant.hasUserWrittenCode() &&
-              !constant.isDynamicallyReplaceable() &&
-              !isPossiblyUsedExternally(linkage, SGM.M.isWholeModule()));
+  bool mayDelay = !constant.hasUserWrittenCode() &&
+                  !constant.isDynamicallyReplaceable() &&
+                  !isPossiblyUsedExternally(linkage, SGM.M.isWholeModule());
 
   // Avoid emitting a delayable definition if it hasn't already been referenced.
+  SILFunction *f = nullptr;
   if (mayDelay)
     f = SGM.getEmittedFunction(constant, ForDefinition);
   else
@@ -1444,12 +1440,8 @@ void SILGenModule::emitFunction(FuncDecl *fd) {
 
   emitAbstractFuncDecl(fd);
 
-  if (fd->hasBody()) {
-    SILDeclRef constant(decl);
-    bool ForCoverageMapping = doesASTRequireProfiling(M, fd, constant);
-    emitOrDelayFunction(*this, constant,
-                        /*forceEmission=*/ForCoverageMapping);
-  }
+  if (fd->hasBody())
+    emitOrDelayFunction(*this, SILDeclRef(decl));
 }
 
 void SILGenModule::addGlobalVariable(VarDecl *global) {