SILGen: Use has_symbol instruction in SILGen.

Author: tshortli

include/swift/AST/Decl.h

@@ -2790,11 +2790,6 @@ class ValueDecl : public Decl {
   /// 'func foo(Int) -> () -> Self?'.
   GenericParameterReferenceInfo findExistentialSelfReferences(
       Type baseTy, bool treatNonResultCovariantSelfAsInvariant) const;
-
-  /// Returns a synthesized declaration for a query function that provides
-  /// the boolean value for a `if #_hasSymbol(...)` condition. The interface
-  /// type of the function is `() -> Builtin.Int1`.
-  FuncDecl *getHasSymbolQueryDecl() const;
 };
 
 /// This is a common base class for declarations which declare a type.

include/swift/AST/TypeCheckRequests.h

@@ -3715,24 +3715,6 @@ class GetTypeWrapperInitializer
   bool isCached() const { return true; }
 };
 
-/// Synthesizes and returns a `#_hasSymbol` query function for the given
-/// `ValueDecl`. The function has an interface type of `() -> Builtin.Int1`.
-class SynthesizeHasSymbolQueryRequest
-    : public SimpleRequest<SynthesizeHasSymbolQueryRequest,
-                           FuncDecl *(const ValueDecl *),
-                           RequestFlags::Cached> {
-public:
-  using SimpleRequest::SimpleRequest;
-
-private:
-  friend SimpleRequest;
-
-  FuncDecl *evaluate(Evaluator &evaluator, const ValueDecl *decl) const;
-
-public:
-  bool isCached() const { return true; }
-};
-
 /// Lookup all macros with the given name that are visible from the given
 /// module.
 class MacroLookupRequest

include/swift/AST/TypeCheckerTypeIDZone.def

@@ -437,9 +437,6 @@ SWIFT_REQUEST(TypeChecker, SynthesizeLocalVariableForTypeWrapperStorage,
 SWIFT_REQUEST(TypeChecker, GetTypeWrapperInitializer,
               ConstructorDecl *(NominalTypeDecl *),
               Cached, NoLocationInfo)
-SWIFT_REQUEST(TypeChecker, SynthesizeHasSymbolQueryRequest,
-              FuncDecl *(ValueDecl *),
-              Cached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, MacroLookupRequest,
               ArrayRef<Macro *>(Identifier, ModuleDecl *),
               Cached, NoLocationInfo)

include/swift/SIL/SILSymbolVisitor.h

@@ -17,6 +17,7 @@
 #include "swift/AST/ProtocolAssociations.h"
 #include "swift/AST/ProtocolConformance.h"
 #include "swift/SIL/SILDeclRef.h"
+#include "swift/SIL/SILModule.h"
 
 namespace swift {
 
@@ -126,6 +127,33 @@ class SILSymbolVisitor {
   virtual void addTypeMetadataAddress(CanType T) {}
 };
 
+template <typename F>
+void enumerateFunctionsForHasSymbol(SILModule &M, ValueDecl *D, F Handler) {
+  class SymbolVisitor : public SILSymbolVisitor {
+    F Handler;
+
+  public:
+    SymbolVisitor(F Handler) : Handler{Handler} {};
+
+    void addFunction(SILDeclRef declRef) override { Handler(declRef); }
+
+    virtual void addFunction(StringRef name, SILDeclRef declRef) override {
+      // The kinds of functions which go through this callback (e.g.
+      // differentiability witnesses) have custom manglings and are incompatible
+      // with #_hasSymbol currently.
+      //
+      // Ideally, this callback will be removed entirely in favor of SILDeclRef
+      // being able to represent all function variants with no special cases
+      // required.
+    }
+  };
+
+  SILSymbolVisitorOptions opts;
+  opts.VisitMembers = false;
+  auto visitorCtx = SILSymbolVisitorContext(M.getSwiftModule(), opts);
+  SymbolVisitor(Handler).visitDecl(D, visitorCtx);
+}
+
 } // end namespace swift
 
 #endif

lib/SILGen/SILGenDecl.cpp

@@ -1616,43 +1616,17 @@ void SILGenFunction::emitStmtCondition(StmtCondition Cond, JumpDest FalseDest,
       assert(declRef);
 
       auto decl = declRef.getDecl();
-      getModule().addHasSymbolDecl(decl);
-
-      SILFunction *silFn = SGM.getFunction(
-          SILDeclRef(decl->getHasSymbolQueryDecl(), SILDeclRef::Kind::Func),
-          NotForDefinition);
-      SILValue fnRef = B.createFunctionRefFor(loc, silFn);
-      booleanTestValue = B.createApply(loc, fnRef, {}, {});
+      booleanTestValue = B.createHasSymbol(expr, decl);
       booleanTestValue = emitUnwrapIntegerResult(expr, booleanTestValue);
       booleanTestLoc = expr;
 
       // Ensure that function declarations for each function associated with
       // the decl are emitted so that they can be referenced during IRGen.
-      class SymbolVisitor : public SILSymbolVisitor {
-        SILGenModule &SGM;
-
-      public:
-        SymbolVisitor(SILGenModule &SGM) : SGM{SGM} {};
-
-        void addFunction(SILDeclRef declRef) override {
-          (void)SGM.getFunction(declRef, NotForDefinition);
-        }
-
-        virtual void addFunction(StringRef name, SILDeclRef declRef) override {
-          // The kinds of functions which go through this callback (e.g.
-          // differentiability witnesses) can't be forward declared with a
-          // SILDeclRef alone. For now, just ignore them.
-          //
-          // Ideally, this callback will be removed entirely in favor of
-          // SILDeclRef being able to represent all function variants.
-        }
-      };
+      enumerateFunctionsForHasSymbol(
+          getModule(), decl, [this](SILDeclRef declRef) {
+            (void)SGM.getFunction(declRef, NotForDefinition);
+          });
 
-      SILSymbolVisitorOptions opts;
-      opts.VisitMembers = false;
-      auto visitorCtx =
-          SILSymbolVisitorContext(getModule().getSwiftModule(), opts);
-      SymbolVisitor(SGM).visitDecl(decl, visitorCtx);
       break;
     }
     }

lib/Sema/CodeSynthesis.cpp

@@ -1798,32 +1798,3 @@ ConstructorDecl *SynthesizeTypeWrappedTypeMemberwiseInitializer::evaluate(
   ctor->setBodySynthesizer(synthesizeTypeWrappedTypeMemberwiseInitializerBody);
   return ctor;
 }
-
-FuncDecl *ValueDecl::getHasSymbolQueryDecl() const {
-  return evaluateOrDefault(getASTContext().evaluator,
-                           SynthesizeHasSymbolQueryRequest{this}, nullptr);
-}
-
-FuncDecl *
-SynthesizeHasSymbolQueryRequest::evaluate(Evaluator &evaluator,
-                                          const ValueDecl *decl) const {
-  auto &ctx = decl->getASTContext();
-  auto dc = decl->getModuleContext();
-
-  Mangle::ASTMangler mangler;
-  auto mangledName = ctx.AllocateCopy(mangler.mangleHasSymbolQuery(decl));
-
-  ParameterList *params = ParameterList::createEmpty(ctx);
-
-  DeclName funcName =
-      DeclName(ctx, DeclBaseName(ctx.getIdentifier(mangledName)),
-               /*argumentNames=*/ArrayRef<Identifier>());
-
-  auto i1 = BuiltinIntegerType::get(1, ctx);
-  FuncDecl *func = FuncDecl::createImplicit(
-      ctx, swift::StaticSpellingKind::None, funcName, SourceLoc(),
-      /*async=*/false, /*throws=*/false, nullptr, params, i1, dc);
-
-  func->getAttrs().add(new (ctx) SILGenNameAttr(mangledName, IsImplicit));
-  return func;
-}

test/AutoDiff/SILGen/has_symbol.swift

@@ -23,13 +23,11 @@ public func bar(_ x: Float) -> (value: Float, pullback: (Float) -> Float) {
 
 // CHECK: sil hidden [ossa] @$s4test0A15GlobalFunctionsyyF : $@convention(thin) () -> ()
 func testGlobalFunctions() {
-  // CHECK: [[QUERY:%[0-9]+]] = function_ref @$s7Library3fooyS2fFTwS : $@convention(thin) () -> Builtin.Int1
-  // CHECK: [[RES:%[0-9]+]] = apply [[QUERY]]() : $@convention(thin) () -> Builtin.Int1
+  // CHECK: [[RES:%[0-9]+]] = has_symbol #foo
   // CHECK: cond_br [[RES]], bb{{[0-9]+}}, bb{{[0-9]+}}
   if #_hasSymbol(foo(_:)) {}
 
-  // CHECK: [[QUERY:%[0-9]+]] = function_ref @$s7Library3barySf5value_S2fc8pullbacktSfFTwS : $@convention(thin) () -> Builtin.Int1
-  // CHECK: [[RES:%[0-9]+]] = apply [[QUERY]]() : $@convention(thin) () -> Builtin.Int1
+  // CHECK: [[RES:%[0-9]+]] = has_symbol #bar
   // CHECK: cond_br [[RES]], bb{{[0-9]+}}, bb{{[0-9]+}}
   if #_hasSymbol(bar(_:)) {}
 }
@@ -41,6 +39,5 @@ func testGlobalFunctions() {
 // FIXME: missing reverse-mode differentiability witness for foo(_:)
 
 // --- bar(_:) ---
-// CHECK: sil hidden_external @$s7Library3barySf5value_S2fc8pullbacktSfFTwS : $@convention(thin) () -> Builtin.Int1
 // CHECK: sil @$s7Library3barySf5value_S2fc8pullbacktSfF : $@convention(thin) (Float) -> (Float, @owned @callee_guaranteed (Float) -> Float)
 // FIXME: missing reverse-mode differentiability witness for foo(_:)