Skip to content

Commit 855671a

Browse files
swift-ciswift-ci
authored
Merge pull request #28453 from CodaFi/clap-yo-hands
2 parents ddaf82d + 4579570 commit 855671a

21 files changed

+200
-181
lines changed

‎include/swift/AST/Attr.h

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ class FuncDecl;
5252
class ClassDecl;
5353
class GenericFunctionType;
5454
class LazyConformanceLoader;
55+
class LazyMemberLoader;
5556
class PatternBindingInitializer;
5657
class TrailingWhereClause;
5758

@@ -1010,18 +1011,31 @@ class DynamicReplacementAttr final
10101011
: public DeclAttribute,
10111012
private llvm::TrailingObjects<DynamicReplacementAttr, SourceLoc> {
10121013
friend TrailingObjects;
1014+
friend class DynamicallyReplacedDeclRequest;
10131015

10141016
DeclName ReplacedFunctionName;
1015-
AbstractFunctionDecl *ReplacedFunction;
1017+
LazyMemberLoader *Resolver = nullptr;
1018+
uint64_t ResolverContextData;
10161019

10171020
/// Create an @_dynamicReplacement(for:) attribute written in the source.
10181021
DynamicReplacementAttr(SourceLoc atLoc, SourceRange baseRange,
10191022
DeclName replacedFunctionName, SourceRange parenRange);
10201023

1021-
explicit DynamicReplacementAttr(DeclName name)
1024+
DynamicReplacementAttr(DeclName name, AbstractFunctionDecl *f)
10221025
: DeclAttribute(DAK_DynamicReplacement, SourceLoc(), SourceRange(),
10231026
/*Implicit=*/false),
1024-
ReplacedFunctionName(name), ReplacedFunction(nullptr) {
1027+
ReplacedFunctionName(name),
1028+
Resolver(nullptr), ResolverContextData(0) {
1029+
Bits.DynamicReplacementAttr.HasTrailingLocationInfo = false;
1030+
}
1031+
1032+
DynamicReplacementAttr(DeclName name,
1033+
LazyMemberLoader *Resolver = nullptr,
1034+
uint64_t Data = 0)
1035+
: DeclAttribute(DAK_DynamicReplacement, SourceLoc(), SourceRange(),
1036+
/*Implicit=*/false),
1037+
ReplacedFunctionName(name),
1038+
Resolver(Resolver), ResolverContextData(Data) {
10251039
Bits.DynamicReplacementAttr.HasTrailingLocationInfo = false;
10261040
}
10271041

@@ -1045,25 +1059,18 @@ class DynamicReplacementAttr final
10451059
SourceLoc LParenLoc, DeclName replacedFunction, SourceLoc RParenLoc);
10461060

10471061
static DynamicReplacementAttr *create(ASTContext &ctx,
1048-
DeclName replacedFunction);
1062+
DeclName replacedFunction,
1063+
AbstractFunctionDecl *replacedFuncDecl);
10491064

10501065
static DynamicReplacementAttr *create(ASTContext &ctx,
10511066
DeclName replacedFunction,
1052-
AbstractFunctionDecl *replacedFuncDecl);
1067+
LazyMemberLoader *Resolver,
1068+
uint64_t Data);
10531069

10541070
DeclName getReplacedFunctionName() const {
10551071
return ReplacedFunctionName;
10561072
}
10571073

1058-
AbstractFunctionDecl *getReplacedFunction() const {
1059-
return ReplacedFunction;
1060-
}
1061-
1062-
void setReplacedFunction(AbstractFunctionDecl *f) {
1063-
assert(ReplacedFunction == nullptr);
1064-
ReplacedFunction = f;
1065-
}
1066-
10671074
/// Retrieve the location of the opening parentheses, if there is one.
10681075
SourceLoc getLParenLoc() const;
10691076

‎include/swift/AST/Decl.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2382,6 +2382,7 @@ class ValueDecl : public Decl {
23822382
unsigned isIUO : 1;
23832383
} LazySemanticInfo = { };
23842384

2385+
friend class DynamicallyReplacedDeclRequest;
23852386
friend class OverriddenDeclsRequest;
23862387
friend class IsObjCRequest;
23872388
friend class IsFinalRequest;
@@ -2742,6 +2743,11 @@ class ValueDecl : public Decl {
27422743
/// Retrieve the @functionBuilder type attached to this declaration,
27432744
/// if there is one.
27442745
Type getFunctionBuilderType() const;
2746+
2747+
/// If this value or its backing storage is annotated
2748+
/// @_dynamicReplacement(for: ...), compute the original declaration
2749+
/// that this declaration dynamically replaces.
2750+
ValueDecl *getDynamicallyReplacedDecl() const;
27452751
};
27462752

27472753
/// This is a common base class for declarations which declare a type.
@@ -4761,8 +4767,6 @@ class AbstractStorageDecl : public ValueDecl {
47614767

47624768
bool hasAnyNativeDynamicAccessors() const;
47634769

4764-
bool hasAnyDynamicReplacementAccessors() const;
4765-
47664770
// Implement isa/cast/dyncast/etc.
47674771
static bool classof(const Decl *D) {
47684772
return D->getKind() >= DeclKind::First_AbstractStorageDecl &&

‎include/swift/AST/LazyResolver.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,11 @@ class alignas(void*) LazyMemberLoader {
103103
virtual void
104104
loadRequirementSignature(const ProtocolDecl *proto, uint64_t contextData,
105105
SmallVectorImpl<Requirement> &requirements) = 0;
106+
107+
/// Returns the replaced decl for a given @_dynamicReplacement(for:) attribute.
108+
virtual ValueDecl *
109+
loadDynamicallyReplacedFunctionDecl(const DynamicReplacementAttr *DRA,
110+
uint64_t contextData) = 0;
106111
};
107112

108113
/// A class that can lazily load conformances from a serialized format.

‎include/swift/AST/TypeCheckRequests.h

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1886,6 +1886,25 @@ class DefaultArgumentExprRequest
18861886
void cacheResult(Expr *expr) const;
18871887
};
18881888

1889+
class DynamicallyReplacedDeclRequest
1890+
: public SimpleRequest<DynamicallyReplacedDeclRequest,
1891+
ValueDecl *(ValueDecl *),
1892+
CacheKind::Cached> {
1893+
public:
1894+
using SimpleRequest::SimpleRequest;
1895+
1896+
private:
1897+
friend SimpleRequest;
1898+
1899+
// Evaluation.
1900+
llvm::Expected<ValueDecl *>
1901+
evaluate(Evaluator &evaluator, ValueDecl *VD) const;
1902+
1903+
public:
1904+
// Caching.
1905+
bool isCached() const { return true; }
1906+
};
1907+
18891908
// Allow AnyValue to compare two Type values, even though Type doesn't
18901909
// support ==.
18911910
template<>

‎include/swift/AST/TypeCheckerTypeIDZone.def

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ SWIFT_REQUEST(TypeChecker, DefaultDefinitionTypeRequest,
4141
SWIFT_REQUEST(TypeChecker, DefaultTypeRequest,
4242
Type(KnownProtocolKind, const DeclContext *), SeparatelyCached,
4343
NoLocationInfo)
44+
SWIFT_REQUEST(TypeChecker, DynamicallyReplacedDeclRequest,
45+
ValueDecl *(ValueDecl *),
46+
Cached, NoLocationInfo)
4447
SWIFT_REQUEST(TypeChecker, EmittedMembersRequest, DeclRange(ClassDecl *),
4548
SeparatelyCached, NoLocationInfo)
4649
SWIFT_REQUEST(TypeChecker, EnumRawValuesRequest,

‎lib/AST/Attr.cpp

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
#include "swift/AST/GenericEnvironment.h"
2323
#include "swift/AST/IndexSubset.h"
2424
#include "swift/AST/Module.h"
25+
#include "swift/AST/ParameterList.h"
2526
#include "swift/AST/TypeRepr.h"
2627
#include "swift/AST/Types.h"
27-
#include "swift/AST/ParameterList.h"
2828
#include "swift/Basic/Defer.h"
2929
#include "llvm/ADT/SmallString.h"
30-
#include "llvm/Support/raw_ostream.h"
31-
#include "llvm/Support/ErrorHandling.h"
3230
#include "llvm/ADT/StringSwitch.h"
31+
#include "llvm/Support/ErrorHandling.h"
32+
#include "llvm/Support/raw_ostream.h"
3333
using namespace swift;
3434

3535
#define DECL_ATTR(_, Id, ...) \
@@ -1135,7 +1135,7 @@ DynamicReplacementAttr::DynamicReplacementAttr(SourceLoc atLoc,
11351135
SourceRange parenRange)
11361136
: DeclAttribute(DAK_DynamicReplacement, atLoc, baseRange,
11371137
/*Implicit=*/false),
1138-
ReplacedFunctionName(name), ReplacedFunction(nullptr) {
1138+
ReplacedFunctionName(name) {
11391139
Bits.DynamicReplacementAttr.HasTrailingLocationInfo = true;
11401140
getTrailingLocations()[0] = parenRange.Start;
11411141
getTrailingLocations()[1] = parenRange.End;
@@ -1152,17 +1152,16 @@ DynamicReplacementAttr::create(ASTContext &Ctx, SourceLoc AtLoc,
11521152
SourceRange(LParenLoc, RParenLoc));
11531153
}
11541154

1155-
DynamicReplacementAttr *DynamicReplacementAttr::create(ASTContext &Ctx,
1156-
DeclName name) {
1157-
return new (Ctx) DynamicReplacementAttr(name);
1155+
DynamicReplacementAttr *
1156+
DynamicReplacementAttr::create(ASTContext &Ctx, DeclName name,
1157+
AbstractFunctionDecl *f) {
1158+
return new (Ctx) DynamicReplacementAttr(name, f);
11581159
}
11591160

11601161
DynamicReplacementAttr *
11611162
DynamicReplacementAttr::create(ASTContext &Ctx, DeclName name,
1162-
AbstractFunctionDecl *f) {
1163-
auto res = new (Ctx) DynamicReplacementAttr(name);
1164-
res->setReplacedFunction(f);
1165-
return res;
1163+
LazyMemberLoader *Resolver, uint64_t Data) {
1164+
return new (Ctx) DynamicReplacementAttr(name, Resolver, Data);
11661165
}
11671166

11681167
SourceLoc DynamicReplacementAttr::getLParenLoc() const {

‎lib/AST/Decl.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2817,6 +2817,13 @@ void ValueDecl::setIsDynamic(bool value) {
28172817
LazySemanticInfo.isDynamic = value;
28182818
}
28192819

2820+
ValueDecl *ValueDecl::getDynamicallyReplacedDecl() const {
2821+
return evaluateOrDefault(getASTContext().evaluator,
2822+
DynamicallyReplacedDeclRequest{
2823+
const_cast<ValueDecl *>(this)},
2824+
nullptr);
2825+
}
2826+
28202827
bool ValueDecl::canBeAccessedByDynamicLookup() const {
28212828
if (!hasName())
28222829
return false;
@@ -4942,9 +4949,9 @@ bool AbstractStorageDecl::hasPrivateAccessor() const {
49424949

49434950
bool AbstractStorageDecl::hasDidSetOrWillSetDynamicReplacement() const {
49444951
if (auto *func = getParsedAccessor(AccessorKind::DidSet))
4945-
return func->getAttrs().hasAttribute<DynamicReplacementAttr>();
4952+
return (bool)func->getDynamicallyReplacedDecl();
49464953
if (auto *func = getParsedAccessor(AccessorKind::WillSet))
4947-
return func->getAttrs().hasAttribute<DynamicReplacementAttr>();
4954+
return (bool)func->getDynamicallyReplacedDecl();
49484955
return false;
49494956
}
49504957

@@ -4956,13 +4963,6 @@ bool AbstractStorageDecl::hasAnyNativeDynamicAccessors() const {
49564963
return false;
49574964
}
49584965

4959-
bool AbstractStorageDecl::hasAnyDynamicReplacementAccessors() const {
4960-
for (auto accessor : getAllAccessors()) {
4961-
if (accessor->getAttrs().hasAttribute<DynamicReplacementAttr>())
4962-
return true;
4963-
}
4964-
return false;
4965-
}
49664966
void AbstractStorageDecl::setAccessors(SourceLoc lbraceLoc,
49674967
ArrayRef<AccessorDecl *> accessors,
49684968
SourceLoc rbraceLoc) {

‎lib/ClangImporter/ImporterImpl.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1230,6 +1230,12 @@ class LLVM_LIBRARY_VISIBILITY ClangImporter::Implementation
12301230
llvm_unreachable("unimplemented for ClangImporter");
12311231
}
12321232

1233+
ValueDecl *
1234+
loadDynamicallyReplacedFunctionDecl(const DynamicReplacementAttr *DRA,
1235+
uint64_t contextData) override {
1236+
llvm_unreachable("unimplemented for ClangImporter");
1237+
}
1238+
12331239
void loadRequirementSignature(const ProtocolDecl *decl, uint64_t contextData,
12341240
SmallVectorImpl<Requirement> &reqs) override {
12351241
llvm_unreachable("unimplemented for ClangImporter");

‎lib/IRGen/GenArchetype.cpp

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -452,21 +452,18 @@ withOpaqueTypeGenericArgs(IRGenFunction &IGF,
452452

453453
bool shouldUseOpaqueTypeDescriptorAccessor(OpaqueTypeDecl *opaque) {
454454
auto *namingDecl = opaque->getNamingDecl();
455-
auto *abstractStorage = dyn_cast<AbstractStorageDecl>(namingDecl);
456455

457456
// Don't emit accessors for abstract storage that is not dynamic or a dynamic
458457
// replacement.
459-
if (abstractStorage) {
458+
if (auto *abstractStorage = dyn_cast<AbstractStorageDecl>(namingDecl)) {
460459
return abstractStorage->hasAnyNativeDynamicAccessors() ||
461-
abstractStorage->hasAnyDynamicReplacementAccessors();
460+
abstractStorage->getDynamicallyReplacedDecl();
462461
}
463462

464463
// Don't emit accessors for functions that are not dynamic or dynamic
465464
// replacements.
466-
return opaque->getNamingDecl()->isNativeDynamic() ||
467-
opaque->getNamingDecl()
468-
->getAttrs()
469-
.hasAttribute<DynamicReplacementAttr>();
465+
return namingDecl->isNativeDynamic() ||
466+
(bool)namingDecl->getDynamicallyReplacedDecl();
470467
}
471468

472469
static llvm::Value *

‎lib/IRGen/GenDecl.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2349,24 +2349,20 @@ void IRGenModule::emitOpaqueTypeDescriptorAccessor(OpaqueTypeDecl *opaque) {
23492349
auto *abstractStorage = dyn_cast<AbstractStorageDecl>(namingDecl);
23502350

23512351
bool isNativeDynamic = false;
2352-
bool isDynamicReplacement = false;
2352+
const bool isDynamicReplacement = namingDecl->getDynamicallyReplacedDecl();
23532353

23542354
// Don't emit accessors for abstract storage that is not dynamic or a dynamic
23552355
// replacement.
23562356
if (abstractStorage) {
23572357
isNativeDynamic = abstractStorage->hasAnyNativeDynamicAccessors();
2358-
isDynamicReplacement = abstractStorage->hasAnyDynamicReplacementAccessors();
23592358
if (!isNativeDynamic && !isDynamicReplacement)
23602359
return;
23612360
}
23622361

23632362
// Don't emit accessors for functions that are not dynamic or dynamic
23642363
// replacements.
23652364
if (!abstractStorage) {
2366-
isNativeDynamic = opaque->getNamingDecl()->isNativeDynamic();
2367-
isDynamicReplacement = opaque->getNamingDecl()
2368-
->getAttrs()
2369-
.hasAttribute<DynamicReplacementAttr>();
2365+
isNativeDynamic = namingDecl->isNativeDynamic();
23702366
if (!isNativeDynamic && !isDynamicReplacement)
23712367
return;
23722368
}

‎lib/SIL/SILFunctionBuilder.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,13 @@ void SILFunctionBuilder::addFunctionAttributes(SILFunction *F,
7676
SILFunctionTypeRepresentation::ObjCMethod)
7777
return;
7878

79-
auto *replacedFuncAttr = Attrs.getAttribute<DynamicReplacementAttr>();
80-
if (!replacedFuncAttr)
79+
// Only assign replacements when the thing being replaced is function-like and
80+
// explicitly declared.
81+
auto *origDecl = decl->getDynamicallyReplacedDecl();
82+
auto *replacedDecl = dyn_cast_or_null<AbstractFunctionDecl>(origDecl);
83+
if (!replacedDecl)
8184
return;
8285

83-
auto *replacedDecl = replacedFuncAttr->getReplacedFunction();
84-
assert(replacedDecl);
85-
8686
if (decl->isObjC()) {
8787
F->setObjCReplacement(replacedDecl);
8888
return;

‎lib/SILGen/SILGenApply.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -789,8 +789,7 @@ bool isCallToReplacedInDynamicReplacement(SILGenFunction &SGF,
789789
bool &isObjCReplacementSelfCall) {
790790
if (auto *func =
791791
dyn_cast_or_null<AbstractFunctionDecl>(SGF.FunctionDC->getAsDecl())) {
792-
auto *repl = func->getAttrs().getAttribute<DynamicReplacementAttr>();
793-
if (repl && repl->getReplacedFunction() == afd) {
792+
if (func->getDynamicallyReplacedDecl() == afd) {
794793
isObjCReplacementSelfCall = afd->isObjC();
795794
return true;
796795
}

0 commit comments

Comments
 (0)