[SIL/SILGen] [AST] NFC: Remove @runtimeMetadata related code

Author: xedin

include/swift/SIL/SILDeclRef.h

@@ -163,10 +163,6 @@ struct SILDeclRef {
 
     /// The asynchronous main entry-point function.
     AsyncEntryPoint,
-
-    /// This constant references the generator function used to instantiate
-    /// attribute value associated with a particular declaration.
-    RuntimeAttributeGenerator,
   };
 
   /// Represents the variants of a back deployable function.
@@ -282,9 +278,6 @@ struct SILDeclRef {
   /// Produces a SILDeclRef for the entry-point of an async main FileUnit.
   static SILDeclRef getAsyncMainFileEntryPoint(FileUnit *file);
 
-  static SILDeclRef getRuntimeAttributeGenerator(CustomAttr *attr,
-                                                 ValueDecl *decl);
-
   bool isNull() const { return loc.isNull(); }
   explicit operator bool() const { return !isNull(); }
 
@@ -528,10 +521,6 @@ struct SILDeclRef {
   /// fallback for an original function which may be unavailable at runtime.
   bool isBackDeploymentFallback() const;
 
-  /// True if the decl ref references a function that could be looked up
-  /// at runtime using special API.
-  bool isRuntimeAccessibleFunction() const;
-
   /// True if the decl ref references a method which introduces a new vtable
   /// entry.
   bool requiresNewVTableEntry() const;

lib/SIL/IR/SILDeclRef.cpp

@@ -370,7 +370,6 @@ bool SILDeclRef::hasUserWrittenCode() const {
   case Kind::PropertyWrapperInitFromProjectedValue:
   case Kind::EntryPoint:
   case Kind::AsyncEntryPoint:
-  case Kind::RuntimeAttributeGenerator:
     // Implicit decls for these don't splice in user-written code.
     return false;
   }
@@ -512,9 +511,6 @@ static LinkageLimit getLinkageLimit(SILDeclRef constant) {
     // class from which they come, and never get seen externally.
     return Limit::NeverPublic;
 
-  case Kind::RuntimeAttributeGenerator:
-    return Limit::NeverPublic;
-
   case Kind::EntryPoint:
   case Kind::AsyncEntryPoint:
     llvm_unreachable("Already handled");
@@ -677,16 +673,6 @@ SILDeclRef SILDeclRef::getMainFileEntryPoint(FileUnit *file) {
   return result;
 }
 
-SILDeclRef SILDeclRef::getRuntimeAttributeGenerator(CustomAttr *attr,
-                                                    ValueDecl *decl) {
-  SILDeclRef result;
-  result.loc = decl;
-  result.kind = Kind::RuntimeAttributeGenerator;
-  result.isRuntimeAccessible = true;
-  result.pointer = attr;
-  return result;
-}
-
 bool SILDeclRef::hasClosureExpr() const {
   return loc.is<AbstractClosureExpr *>()
     && isa<ClosureExpr>(getAbstractClosureExpr());
@@ -1046,11 +1032,6 @@ bool SILDeclRef::isBackDeploymentThunk() const {
          kind == Kind::Allocator;
 }
 
-bool SILDeclRef::isRuntimeAccessibleFunction() const {
-  return isRuntimeAccessible &&
-         (kind == Kind::Func || kind == Kind::RuntimeAttributeGenerator);
-}
-
 /// Use the Clang importer to mangle a Clang declaration.
 static void mangleClangDecl(raw_ostream &buffer,
                             const clang::NamedDecl *clangDecl,
@@ -1230,10 +1211,6 @@ std::string SILDeclRef::mangle(ManglingKind MKind) const {
   case SILDeclRef::Kind::EntryPoint: {
     return getASTContext().getEntryPointFunctionName();
   }
-
-  case SILDeclRef::Kind::RuntimeAttributeGenerator:
-    return mangler.mangleRuntimeAttributeGeneratorEntity(
-        loc.get<ValueDecl *>(), pointer.get<CustomAttr *>(), SKind);
   }
 
   llvm_unreachable("bad entity kind!");
@@ -1603,7 +1580,7 @@ unsigned SILDeclRef::getParameterListCount() const {
 
   // Always uncurried even if the underlying function is curried.
   if (kind == Kind::DefaultArgGenerator || kind == Kind::EntryPoint ||
-      kind == Kind::AsyncEntryPoint || kind == Kind::RuntimeAttributeGenerator)
+      kind == Kind::AsyncEntryPoint)
     return 1;
 
   auto *vd = getDecl();

lib/SIL/IR/SILFunctionBuilder.cpp

@@ -311,8 +311,6 @@ SILFunction *SILFunctionBuilder::getOrCreateFunction(
   }
 
   IsRuntimeAccessible_t isRuntimeAccessible = IsNotRuntimeAccessible;
-  if (constant.isRuntimeAccessibleFunction())
-    isRuntimeAccessible = IsRuntimeAccessible;
 
   auto *F = SILFunction::create(
       mod, linkage, name, constantType, nullptr, llvm::None, IsNotBare, IsTrans,

lib/SIL/IR/SILFunctionType.cpp

@@ -2748,9 +2748,6 @@ static CanSILFunctionType getNativeSILFunctionType(
     case SILDeclRef::Kind::AsyncEntryPoint:
       return getSILFunctionTypeForConventions(
           DefaultConventions(NormalParameterConvention::Guaranteed));
-    case SILDeclRef::Kind::RuntimeAttributeGenerator:
-      return getSILFunctionTypeForConventions(DefaultConventions(
-          NormalParameterConvention::Guaranteed, ResultConvention::Indirect));
     case SILDeclRef::Kind::EntryPoint:
       llvm_unreachable("Handled by getSILFunctionTypeForAbstractCFunction");
     }
@@ -3786,7 +3783,6 @@ static ObjCSelectorFamily getObjCSelectorFamily(SILDeclRef c) {
   case SILDeclRef::Kind::EnumElement:
   case SILDeclRef::Kind::GlobalAccessor:
   case SILDeclRef::Kind::DefaultArgGenerator:
-  case SILDeclRef::Kind::RuntimeAttributeGenerator:
   case SILDeclRef::Kind::StoredPropertyInitializer:
   case SILDeclRef::Kind::PropertyWrapperBackingInitializer:
   case SILDeclRef::Kind::PropertyWrapperInitFromProjectedValue:
@@ -4061,7 +4057,6 @@ TypeConverter::getDeclRefRepresentation(SILDeclRef c) {
   switch (c.kind) {
     case SILDeclRef::Kind::GlobalAccessor:
     case SILDeclRef::Kind::DefaultArgGenerator:
-    case SILDeclRef::Kind::RuntimeAttributeGenerator:
     case SILDeclRef::Kind::StoredPropertyInitializer:
     case SILDeclRef::Kind::PropertyWrapperBackingInitializer:
     case SILDeclRef::Kind::PropertyWrapperInitFromProjectedValue:
@@ -4466,7 +4461,6 @@ static AbstractFunctionDecl *getBridgedFunction(SILDeclRef declRef) {
   case SILDeclRef::Kind::Deallocator:
   case SILDeclRef::Kind::GlobalAccessor:
   case SILDeclRef::Kind::DefaultArgGenerator:
-  case SILDeclRef::Kind::RuntimeAttributeGenerator:
   case SILDeclRef::Kind::StoredPropertyInitializer:
   case SILDeclRef::Kind::PropertyWrapperBackingInitializer:
   case SILDeclRef::Kind::PropertyWrapperInitFromProjectedValue:

lib/SIL/IR/SILPrinter.cpp

@@ -391,9 +391,6 @@ void SILDeclRef::print(raw_ostream &OS) const {
   case SILDeclRef::Kind::PropertyWrapperInitFromProjectedValue:
     OS << "!projectedvalueinit";
     break;
-  case SILDeclRef::Kind::RuntimeAttributeGenerator:
-    OS << "!attrgenerator";
-    break;
   }
 
   if (isForeign)

lib/SIL/IR/SILSymbolVisitor.cpp

@@ -368,13 +368,6 @@ class SILSymbolVisitorImpl : public ASTVisitor<SILSymbolVisitorImpl> {
     Visitor.addMethodDescriptor(method);
   }
 
-  void addRuntimeDiscoverableAttrGenerators(ValueDecl *D) {
-    for (auto *attr : D->getRuntimeDiscoverableAttrs()) {
-      addFunction(SILDeclRef::getRuntimeAttributeGenerator(attr, D),
-                  /*ignoreLinkage=*/true);
-    }
-  }
-
 public:
   SILSymbolVisitorImpl(SILSymbolVisitor &Visitor,
                        const SILSymbolVisitorContext &Ctx)
@@ -492,8 +485,6 @@ class SILSymbolVisitorImpl : public ASTVisitor<SILSymbolVisitorImpl> {
                          AFD->getGenericSignature()));
     }
 
-    addRuntimeDiscoverableAttrGenerators(AFD);
-
     visitDefaultArguments(AFD, AFD->getParameters());
 
     if (AFD->hasAsync()) {
@@ -580,8 +571,6 @@ class SILSymbolVisitorImpl : public ASTVisitor<SILSymbolVisitorImpl> {
     }
 
     visitAbstractStorageDecl(VD);
-
-    addRuntimeDiscoverableAttrGenerators(VD);
   }
 
   void visitSubscriptDecl(SubscriptDecl *SD) {
@@ -619,8 +608,6 @@ class SILSymbolVisitorImpl : public ASTVisitor<SILSymbolVisitorImpl> {
     // There are symbols associated with any protocols this type conforms to.
     addConformances(NTD);
 
-    addRuntimeDiscoverableAttrGenerators(NTD);
-
     visitMembers(NTD);
   }
 

lib/SIL/IR/TypeLowering.cpp

@@ -3375,30 +3375,6 @@ static CanAnyFunctionType getStoredPropertyInitializerInterfaceType(
                                  info);
 }
 
-/// Type of runtime discoverable attribute generator is () -> <#AttrType#>
-static CanAnyFunctionType
-getRuntimeAttributeGeneratorInterfaceType(TypeConverter &TC, SILDeclRef c) {
-  auto *attachedToDecl = c.getDecl();
-  auto *attr = c.pointer.get<CustomAttr *>();
-  auto *attrType = attachedToDecl->getRuntimeDiscoverableAttrTypeDecl(attr);
-  auto generator =
-      attachedToDecl->getRuntimeDiscoverableAttributeGenerator(attr);
-
-  auto resultTy = generator.second->getCanonicalType();
-
-  CanType canResultTy = resultTy->getReducedType(
-      attrType->getInnermostDeclContext()->getGenericSignatureOfContext());
-
-  // Remove @noescape from function return types. A @noescape
-  // function return type is a contradiction.
-  canResultTy = removeNoEscape(canResultTy);
-
-  // FIXME: Verify ExtInfo state is correct, not working by accident.
-  CanAnyFunctionType::ExtInfo info;
-  return CanAnyFunctionType::get(/*genericSignature=*/nullptr,
-                                 /*params=*/{}, canResultTy, info);
-}
-
 /// Get the type of a property wrapper backing initializer,
 /// (property-type) -> backing-type.
 static CanAnyFunctionType getPropertyWrapperBackingInitializerInterfaceType(
@@ -3659,8 +3635,6 @@ CanAnyFunctionType TypeConverter::makeConstantInterfaceType(SILDeclRef c) {
     return getAsyncEntryPoint(Context);
   case SILDeclRef::Kind::EntryPoint:
     return getEntryPointInterfaceType(Context);
-  case SILDeclRef::Kind::RuntimeAttributeGenerator:
-    return getRuntimeAttributeGeneratorInterfaceType(*this, c);
   }
 
   llvm_unreachable("Unhandled SILDeclRefKind in switch.");
@@ -3714,7 +3688,6 @@ TypeConverter::getConstantGenericSignature(SILDeclRef c) {
     return vd->getDeclContext()->getGenericSignatureOfContext();
   case SILDeclRef::Kind::EntryPoint:
   case SILDeclRef::Kind::AsyncEntryPoint:
-  case SILDeclRef::Kind::RuntimeAttributeGenerator:
     llvm_unreachable("Doesn't have generic signature");
   }
 

lib/SIL/Parser/ParseSIL.cpp

@@ -1707,9 +1707,6 @@ bool SILParser::parseSILDeclRef(SILDeclRef &Result,
       } else if (!ParseState && Id.str() == "defaultarg") {
         Kind = SILDeclRef::Kind::IVarInitializer;
         ParseState = 1;
-      } else if (!ParseState && Id.str() == "attrgenerator") {
-        Kind = SILDeclRef::Kind::RuntimeAttributeGenerator;
-        ParseState = 1;
       } else if (!ParseState && Id.str() == "propertyinit") {
         Kind = SILDeclRef::Kind::StoredPropertyInitializer;
         ParseState = 1;

lib/SILGen/SILGen.cpp

@@ -1133,22 +1133,6 @@ void SILGenModule::emitFunctionDefinition(SILDeclRef constant, SILFunction *f) {
     postEmitFunction(constant, f);
     return;
   }
-
-  case SILDeclRef::Kind::RuntimeAttributeGenerator: {
-    auto *decl = constant.getDecl();
-    auto *attr = constant.pointer.get<CustomAttr *>();
-    auto *DC = decl->getDeclContext()->getParentSourceFile();
-
-    auto generator = decl->getRuntimeDiscoverableAttributeGenerator(attr);
-    auto loc = RegularLocation::getAutoGeneratedLocation();
-    preEmitFunction(constant, f, loc);
-    PrettyStackTraceSILFunction X("silgen emitRuntimeAttributeGenerator ", f);
-    SILGenFunction SGF(*this, *f, DC);
-    SGF.emitGeneratorFunction(constant, generator.second, generator.first,
-                              AbstractionPattern::getOpaqueFunction());
-    postEmitFunction(constant, f);
-    break;
-  }
   }
 }
 
@@ -2000,14 +1984,6 @@ class SILGenModuleRAII {
       SGM.visit(TD);
     }
 
-    for (auto *D : sf->getDeclsWithRuntimeDiscoverableAttrs()) {
-      for (auto *attr : D->getRuntimeDiscoverableAttrs()) {
-        emitSILFunctionDefinition(
-            SILDeclRef::getRuntimeAttributeGenerator(attr, D)
-                .asRuntimeAccessible());
-      }
-    }
-
     // If the source file contains an artificial main, emit the implicit
     // top-level code.
     if (auto *mainDecl = sf->getMainDecl()) {

lib/SILGen/SILGenFunction.cpp

@@ -201,13 +201,6 @@ DeclName SILGenModule::getMagicFunctionName(SILDeclRef ref) {
     auto *file = ref.getDecl()->getDeclContext()->getParentSourceFile();
     return getMagicFunctionName(file);
   }
-  case SILDeclRef::Kind::RuntimeAttributeGenerator: {
-    if (auto *var = dyn_cast<VarDecl>(ref.getDecl()))
-      return var->getName();
-
-    auto *DC = dyn_cast<DeclContext>(ref.getDecl());
-    return getMagicFunctionName(DC ? DC : ref.getDecl()->getDeclContext());
-  }
   }
 
   llvm_unreachable("Unhandled SILDeclRefKind in switch.");
@@ -1507,8 +1500,6 @@ void SILGenFunction::emitGeneratorFunction(SILDeclRef function, Expr *value,
     }
 
     params = ParameterList::create(ctx, SourceLoc(), {param}, SourceLoc());
-  } else if (function.kind == SILDeclRef::Kind::RuntimeAttributeGenerator) {
-    params = ParameterList::createEmpty(getASTContext());
   }
 
   auto captureInfo = SGM.M.Types.getLoweredLocalCaptures(function);