Merge pull request swiftlang#15974 from slavapestov/remove-disable-sil-linking

SIL: Remove -disable-sil-linking frontend flag

Author: slavapestov

include/swift/AST/SILOptions.h

@@ -42,20 +42,6 @@ class SILOptions {
   /// The number of threads for multi-threaded code generation.
   int NumThreads = 0;
 
-  enum LinkingMode {
-    /// Skip SIL linking.
-    LinkNone,
-
-    /// Perform normal SIL linking.
-    LinkNormal,
-
-    /// Link all functions during SIL linking.
-    LinkAll
-  };
-
-  /// Controls how to perform SIL linking.
-  LinkingMode LinkMode = LinkNormal;
-
   /// Controls whether to pull in SIL from partial modules during the
   /// merge modules step. Could perhaps be merged with the link mode
   /// above but the interactions between all the flags are tricky.

include/swift/Option/FrontendOptions.td

@@ -243,9 +243,6 @@ def stack_promotion_limit : Separate<["-"], "stack-promotion-limit">,
   HelpText<"Limit the size of stack promoted objects to the provided number "
            "of bytes.">;
 
-def disable_sil_linking : Flag<["-"], "disable-sil-linking">,
-  HelpText<"Don't link SIL functions">;
-
 def dump_clang_diagnostics : Flag<["-"], "dump-clang-diagnostics">,
   HelpText<"Dump Clang diagnostics to stderr">;
 

include/swift/SIL/SILModule.h

@@ -110,7 +110,15 @@ class SILModule {
   using DefaultWitnessTableListType = llvm::ilist<SILDefaultWitnessTable>;
   using CoverageMapCollectionType =
       llvm::MapVector<StringRef, SILCoverageMap *>;
-  using LinkingMode = SILOptions::LinkingMode;
+
+  enum class LinkingMode : uint8_t {
+    /// Link functions with non-public linkage. Used by the mandatory pipeline.
+    LinkNormal,
+
+    /// Link all functions. Used by the performance pipeine.
+    LinkAll
+  };
+
   using ActionCallback = std::function<void()>;
 
 private:
@@ -499,7 +507,7 @@ class SILModule {
   ///
   /// \return false if the linking failed.
   bool linkFunction(SILFunction *F,
-                    LinkingMode LinkAll = LinkingMode::LinkNormal);
+                    LinkingMode LinkMode = LinkingMode::LinkNormal);
 
   /// Check if a given function exists in any of the modules with a
   /// required linkage, i.e. it can be linked by linkFunction.

lib/Frontend/CompilerInvocation.cpp

@@ -576,9 +576,6 @@ static bool ParseSILArgs(SILOptions &Opts, ArgList &Args,
     }
   }
 
-  if (const Arg *A = Args.getLastArg(OPT_disable_sil_linking))
-    Opts.LinkMode = SILOptions::LinkNone;
-
   if (Args.hasArg(OPT_sil_merge_partial_modules))
     Opts.MergePartialModules = true;
 

lib/SIL/Linker.cpp

@@ -114,9 +114,6 @@ void SILLinkerVisitor::maybeAddFunctionToWorklist(SILFunction *F) {
 
 /// Process F, recursively deserializing any thing F may reference.
 bool SILLinkerVisitor::processFunction(SILFunction *F) {
-  if (Mode == LinkingMode::LinkNone)
-    return false;
-
   // If F is a declaration, first deserialize it.
   if (F->isExternalDeclaration()) {
     maybeAddFunctionToWorklist(F);

lib/SILOptimizer/Mandatory/MandatoryInlining.cpp

@@ -259,8 +259,7 @@ static void collectPartiallyAppliedArguments(
 static SILFunction *getCalleeFunction(
     SILFunction *F, FullApplySite AI, bool &IsThick,
     SmallVectorImpl<std::pair<SILValue, ParameterConvention>> &CaptureArgs,
-    SmallVectorImpl<SILValue> &FullArgs, PartialApplyInst *&PartialApply,
-    SILModule::LinkingMode Mode) {
+    SmallVectorImpl<SILValue> &FullArgs, PartialApplyInst *&PartialApply) {
   IsThick = false;
   PartialApply = nullptr;
   CaptureArgs.clear();
@@ -410,11 +409,8 @@ static SILFunction *getCalleeFunction(
     return nullptr;
 
   // If CalleeFunction is a declaration, see if we can load it.
-  if (CalleeFunction->empty()) {
-    // FIXME: Remove 'Mode'
-    if (Mode != SILOptions::LinkingMode::LinkNone)
-      AI.getModule().loadFunction(CalleeFunction);
-  }
+  if (CalleeFunction->empty())
+    AI.getModule().loadFunction(CalleeFunction);
 
   // If we fail to load it, bail.
   if (CalleeFunction->empty())
@@ -467,7 +463,6 @@ tryDevirtualizeApplyHelper(FullApplySite InnerAI, SILBasicBlock::iterator I,
 /// \returns true if successful, false if failed due to circular inlining.
 static bool
 runOnFunctionRecursively(SILFunction *F, FullApplySite AI,
-                         SILModule::LinkingMode Mode,
                          DenseFunctionSet &FullyInlinedSet,
                          ImmutableFunctionSet::Factory &SetFactory,
                          ImmutableFunctionSet CurrentInliningSet,
@@ -515,13 +510,13 @@ runOnFunctionRecursively(SILFunction *F, FullApplySite AI,
       bool IsThick;
       PartialApplyInst *PAI;
       SILFunction *CalleeFunction = getCalleeFunction(
-          F, InnerAI, IsThick, CaptureArgs, FullArgs, PAI, Mode);
+          F, InnerAI, IsThick, CaptureArgs, FullArgs, PAI);
 
       if (!CalleeFunction)
         continue;
 
       // Then recursively process it first before trying to inline it.
-      if (!runOnFunctionRecursively(CalleeFunction, InnerAI, Mode,
+      if (!runOnFunctionRecursively(CalleeFunction, InnerAI,
                                     FullyInlinedSet, SetFactory,
                                     CurrentInliningSet, CHA)) {
         // If we failed due to circular inlining, then emit some notes to
@@ -630,7 +625,6 @@ class MandatoryInlining : public SILModuleTransform {
   void run() override {
     ClassHierarchyAnalysis *CHA = getAnalysis<ClassHierarchyAnalysis>();
     SILModule *M = getModule();
-    SILModule::LinkingMode Mode = getOptions().LinkMode;
     bool ShouldCleanup = !getOptions().DebugSerialization;
     DenseFunctionSet FullyInlinedSet;
     ImmutableFunctionSet::Factory SetFactory;
@@ -645,9 +639,8 @@ class MandatoryInlining : public SILModuleTransform {
         continue;
 
       runOnFunctionRecursively(&F,
-                               FullApplySite(static_cast<ApplyInst*>(nullptr)),
-                               Mode, FullyInlinedSet,
-                               SetFactory, SetFactory.getEmptySet(), CHA);
+                               FullApplySite(), FullyInlinedSet, SetFactory,
+                               SetFactory.getEmptySet(), CHA);
     }
 
     if (!ShouldCleanup)

test/DebugInfo/LinetableArtificialFn.swift

@@ -20,8 +20,6 @@
 // --------------------------------------------------------------------
 // Now check that we do generate line+scope info with -g.
 // RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s
-// RUN: %target-swift-frontend %s -emit-ir -g -o - -disable-sil-linking \
-// RUN:   | %FileCheck %s --check-prefix=CHECK-NOSIL
 // --------------------------------------------------------------------
 // Currently -gdwarf-types should give the same results as -g.
 // RUN: %target-swift-frontend %s -emit-ir -gdwarf-types -o - | %FileCheck %s
@@ -49,10 +47,7 @@ func foo(_ a: Int64, _ b: Int64) -> Int64 {
        // CHECK-DAG: !DILexicalBlock({{.*}} line: [[@LINE-1]]
        // Transparent inlined multiply:
        // CHECK-DAG: smul{{.*}}, !dbg ![[MUL:[0-9]+]]
-       // CHECK-DAG: [[MUL]] = !DILocation(line: [[@LINE+4]], column: 16,
-       // Runtime call to multiply function:
-       // CHECK-NOSIL: @"$Ss5Int64V1moiyA2B_ABtFZ{{.*}}, !dbg ![[MUL:[0-9]+]]
-       // CHECK-NOSIL: [[MUL]] = !DILocation(line: [[@LINE+1]], column: 16,
+       // CHECK-DAG: [[MUL]] = !DILocation(line: [[@LINE+1]], column: 16,
        return a*b
      } else {
        // CHECK-DAG: ![[PARENT:[0-9]+]] = distinct !DILexicalBlock({{.*}} line: [[@LINE-1]], column: 13)

test/DebugInfo/basic.swift

@@ -1,9 +1,4 @@
-// RUN: %target-swift-frontend %s -enable-sil-ownership -disable-sil-linking -emit-sil -o - | %FileCheck %s
-
-// NOTE: We add -disable-sil-linking to the compile line to ensure that we have
-// access to declarations for standard library types, but not definitions. This
-// ensures that we are able to safely use standard library types for this test
-// without needing the standard library to be ownership correct in its body.
+// RUN: %target-swift-frontend %s -enable-sil-ownership -emit-sil -o - | %FileCheck %s
 
 class Foo {
   func foo() -> Int {