@@ -340,12 +340,7 @@ class alignas(1 << DeclAlignInBits) Decl {
340340 IsUserAccessible : 1
341341 );
342342
343- SWIFT_INLINE_BITFIELD (AbstractStorageDecl, ValueDecl, 1 +1 +1 ,
344- // / Whether a keypath component can directly reference this storage,
345- // / or if it must use the overridden declaration instead.
346- HasComputedValidKeyPathComponent : 1 ,
347- ValidKeyPathComponent : 1 ,
348-
343+ SWIFT_INLINE_BITFIELD (AbstractStorageDecl, ValueDecl, 1 ,
349344 // / Whether this property is a type property (currently unfortunately
350345 // / called 'static').
351346 IsStatic : 1
@@ -393,7 +388,7 @@ class alignas(1 << DeclAlignInBits) Decl {
393388 SWIFT_INLINE_BITFIELD (SubscriptDecl, VarDecl, 2 ,
394389 StaticSpelling : 2
395390 );
396- SWIFT_INLINE_BITFIELD (AbstractFunctionDecl, ValueDecl, 3 +8 +1 +1 +1 +1 +1 +1 + 1 + 1 ,
391+ SWIFT_INLINE_BITFIELD (AbstractFunctionDecl, ValueDecl, 3 +8 +1 +1 +1 +1 +1 +1 ,
397392 // / \see AbstractFunctionDecl::BodyKind
398393 BodyKind : 3 ,
399394
@@ -409,12 +404,6 @@ class alignas(1 << DeclAlignInBits) Decl {
409404 // / Whether the function body throws.
410405 Throws : 1 ,
411406
412- // / Whether this function requires a new vtable entry.
413- NeedsNewVTableEntry : 1 ,
414-
415- // / Whether NeedsNewVTableEntry is valid.
416- HasComputedNeedsNewVTableEntry : 1 ,
417-
418407 // / Whether this member was synthesized as part of a derived
419408 // / protocol conformance.
420409 Synthesized : 1 ,
@@ -423,7 +412,10 @@ class alignas(1 << DeclAlignInBits) Decl {
423412 HasSingleExpressionBody : 1
424413 );
425414
426- SWIFT_INLINE_BITFIELD (FuncDecl, AbstractFunctionDecl, 1 +2 +1 +1 +2 ,
415+ SWIFT_INLINE_BITFIELD (FuncDecl, AbstractFunctionDecl, 1 +1 +2 +1 +1 +2 ,
416+ // / Whether we've computed the 'static' flag yet.
417+ IsStaticComputed : 1 ,
418+
427419 // / Whether this function is a 'static' method.
428420 IsStatic : 1 ,
429421
@@ -859,17 +851,6 @@ class alignas(1 << DeclAlignInBits) Decl {
859851 return getValidationState () > ValidationState::Unchecked;
860852 }
861853
862- // / Manually indicate that validation is complete for the declaration. For
863- // / example: during importing, code synthesis, or derived conformances.
864- // /
865- // / For normal code validation, please use DeclValidationRAII instead.
866- // /
867- // / FIXME -- Everything should use DeclValidationRAII instead of this.
868- void setValidationToChecked () {
869- if (!isBeingValidated ())
870- Bits.Decl .ValidationState = unsigned (ValidationState::Checked);
871- }
872-
873854 bool escapedFromIfConfig () const {
874855 return Bits.Decl .EscapedFromIfConfig ;
875856 }
@@ -2610,6 +2591,9 @@ class ValueDecl : public Decl {
26102591 // / if the base declaration is \c open, the override might have to be too.
26112592 bool hasOpenAccess (const DeclContext *useDC) const ;
26122593
2594+ // / FIXME: This is deprecated.
2595+ bool isRecursiveValidation () const ;
2596+
26132597 // / Retrieve the "interface" type of this value, which uses
26142598 // / GenericTypeParamType if the declaration is generic. For a generic
26152599 // / function, this will have a GenericFunctionType with a
@@ -2769,12 +2753,6 @@ class ValueDecl : public Decl {
27692753 // / Get the representative for this value's opaque result type, if it has one.
27702754 OpaqueReturnTypeRepr *getOpaqueResultTypeRepr () const ;
27712755
2772- // / Set the opaque return type decl for this decl.
2773- // /
2774- // / `this` must be of a decl type that supports opaque return types, and
2775- // / must not have previously had an opaque result type set.
2776- void setOpaqueResultTypeDecl (OpaqueTypeDecl *D);
2777-
27782756 // / Retrieve the attribute associating this declaration with a
27792757 // / function builder, if there is one.
27802758 CustomAttr *getAttachedFunctionBuilder () const ;
@@ -4535,10 +4513,6 @@ class AbstractStorageDecl : public ValueDecl {
45354513 Bits.AbstractStorageDecl .IsStatic = IsStatic;
45364514 }
45374515
4538- void computeIsValidKeyPathComponent ();
4539-
4540- OpaqueTypeDecl *OpaqueReturn = nullptr ;
4541-
45424516public:
45434517
45444518 // / Should this declaration be treated as if annotated with transparent
@@ -4779,18 +4753,9 @@ class AbstractStorageDecl : public ValueDecl {
47794753 // / property from the given module?
47804754 bool isResilient (ModuleDecl *M, ResilienceExpansion expansion) const ;
47814755
4782- void setIsValidKeyPathComponent (bool value) {
4783- Bits.AbstractStorageDecl .HasComputedValidKeyPathComponent = true ;
4784- Bits.AbstractStorageDecl .ValidKeyPathComponent = value;
4785- }
4786-
47874756 // / True if the storage can be referenced by a keypath directly.
47884757 // / Otherwise, its override must be referenced.
4789- bool isValidKeyPathComponent () const {
4790- if (!Bits.AbstractStorageDecl .HasComputedValidKeyPathComponent )
4791- const_cast <AbstractStorageDecl *>(
this )->
computeIsValidKeyPathComponent ();
4792- return Bits.AbstractStorageDecl .ValidKeyPathComponent ;
4793- }
4758+ bool isValidKeyPathComponent () const ;
47944759
47954760 // / True if the storage exports a property descriptor for key paths in
47964761 // / other modules.
@@ -4805,14 +4770,6 @@ class AbstractStorageDecl : public ValueDecl {
48054770
48064771 bool hasAnyDynamicReplacementAccessors () const ;
48074772
4808- OpaqueTypeDecl *getOpaqueResultTypeDecl () const {
4809- return OpaqueReturn;
4810- }
4811- void setOpaqueResultTypeDecl (OpaqueTypeDecl *decl) {
4812- assert (!OpaqueReturn && " already has opaque type decl"
4813- OpaqueReturn = decl;
4814- }
4815-
48164773 // Implement isa/cast/dyncast/etc.
48174774 static bool classof (const Decl *D) {
48184775 return D->getKind () >= DeclKind::First_AbstractStorageDecl &&
@@ -5590,6 +5547,8 @@ class ImportAsMemberStatus {
55905547
55915548// / Base class for function-like declarations.
55925549class AbstractFunctionDecl : public GenericContext , public ValueDecl {
5550+ friend class NeedsNewVTableEntryRequest ;
5551+
55935552public:
55945553 enum class BodyKind {
55955554 // / The function did not have a body in the source code file.
@@ -5659,6 +5618,11 @@ class AbstractFunctionDecl : public GenericContext, public ValueDecl {
56595618 // / Location of the 'throws' token.
56605619 SourceLoc ThrowsLoc;
56615620
5621+ struct {
5622+ unsigned NeedsNewVTableEntryComputed : 1 ;
5623+ unsigned NeedsNewVTableEntry : 1 ;
5624+ } LazySemanticInfo = { };
5625+
56625626 AbstractFunctionDecl (DeclKind Kind, DeclContext *Parent, DeclName Name,
56635627 SourceLoc NameLoc, bool Throws, SourceLoc ThrowsLoc,
56645628 bool HasImplicitSelfDecl,
@@ -5670,8 +5634,6 @@ class AbstractFunctionDecl : public GenericContext, public ValueDecl {
56705634 Bits.AbstractFunctionDecl .HasImplicitSelfDecl = HasImplicitSelfDecl;
56715635 Bits.AbstractFunctionDecl .Overridden = false ;
56725636 Bits.AbstractFunctionDecl .Throws = Throws;
5673- Bits.AbstractFunctionDecl .NeedsNewVTableEntry = false ;
5674- Bits.AbstractFunctionDecl .HasComputedNeedsNewVTableEntry = false ;
56755637 Bits.AbstractFunctionDecl .Synthesized = false ;
56765638 Bits.AbstractFunctionDecl .HasSingleExpressionBody = false ;
56775639 }
@@ -5841,16 +5803,9 @@ class AbstractFunctionDecl : public GenericContext, public ValueDecl {
58415803 return getBodyKind () == BodyKind::MemberwiseInitializer;
58425804 }
58435805
5844- void setNeedsNewVTableEntry (bool value) {
5845- Bits.AbstractFunctionDecl .HasComputedNeedsNewVTableEntry = true ;
5846- Bits.AbstractFunctionDecl .NeedsNewVTableEntry = value;
5847- }
5848-
5849- bool needsNewVTableEntry () const {
5850- if (!Bits.AbstractFunctionDecl .HasComputedNeedsNewVTableEntry )
5851- const_cast <AbstractFunctionDecl *>(
this )->
computeNeedsNewVTableEntry ();
5852- return Bits.AbstractFunctionDecl .NeedsNewVTableEntry ;
5853- }
5806+ // / For a method of a class, checks whether it will require a new entry in the
5807+ // / vtable.
5808+ bool needsNewVTableEntry () const ;
58545809
58555810 bool isEffectiveLinkageMoreVisibleThan (ValueDecl *other) const {
58565811 return (std::min (getEffectiveAccess (), AccessLevel::Public) >
@@ -5992,14 +5947,13 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, SelfAccessKind SAK);
59925947class FuncDecl : public AbstractFunctionDecl {
59935948 friend class AbstractFunctionDecl ;
59945949 friend class SelfAccessKindRequest ;
5950+ friend class IsStaticRequest ;
59955951
59965952 SourceLoc StaticLoc; // Location of the 'static' token or invalid.
59975953 SourceLoc FuncLoc; // Location of the 'func' token.
59985954
59995955 TypeLoc FnRetType;
60005956
6001- OpaqueTypeDecl *OpaqueReturn = nullptr ;
6002-
60035957protected:
60045958 FuncDecl (DeclKind Kind,
60055959 SourceLoc StaticLoc, StaticSpellingKind StaticSpelling,
@@ -6015,14 +5969,14 @@ class FuncDecl : public AbstractFunctionDecl {
60155969 StaticLoc (StaticLoc), FuncLoc(FuncLoc) {
60165970 assert (!Name.getBaseName ().isSpecial ());
60175971
6018- Bits.FuncDecl .IsStatic =
6019- StaticLoc.isValid () || StaticSpelling != StaticSpellingKind::None;
60205972 Bits.FuncDecl .StaticSpelling = static_cast <unsigned >(StaticSpelling);
60215973
60225974 Bits.FuncDecl .ForcedStaticDispatch = false ;
60235975 Bits.FuncDecl .SelfAccess =
60245976 static_cast <unsigned >(SelfAccessKind::NonMutating);
60255977 Bits.FuncDecl .SelfAccessComputed = false ;
5978+ Bits.FuncDecl .IsStaticComputed = false ;
5979+ Bits.FuncDecl .IsStatic = false ;
60265980 }
60275981
60285982private:
@@ -6042,6 +5996,13 @@ class FuncDecl : public AbstractFunctionDecl {
60425996 return None;
60435997 }
60445998
5999+ Optional<bool > getCachedIsStatic () const {
6000+ if (Bits.FuncDecl .IsStaticComputed )
6001+ return Bits.FuncDecl .IsStatic ;
6002+
6003+ return None;
6004+ }
6005+
60456006public:
60466007 // / Factory function only for use by deserialization.
60476008 static FuncDecl *createDeserialized (ASTContext &Context, SourceLoc StaticLoc,
@@ -6064,16 +6025,16 @@ class FuncDecl : public AbstractFunctionDecl {
60646025
60656026 Identifier getName () const { return getFullName ().getBaseIdentifier (); }
60666027
6067- bool isStatic () const {
6068- return Bits.FuncDecl .IsStatic ;
6069- }
6028+ bool isStatic () const ;
6029+
60706030 // / \returns the way 'static'/'class' was spelled in the source.
60716031 StaticSpellingKind getStaticSpelling () const {
60726032 return static_cast <StaticSpellingKind>(Bits.FuncDecl .StaticSpelling );
60736033 }
60746034 // / \returns the way 'static'/'class' should be spelled for this declaration.
60756035 StaticSpellingKind getCorrectStaticSpelling () const ;
60766036 void setStatic (bool IsStatic = true ) {
6037+ Bits.FuncDecl .IsStaticComputed = true ;
60776038 Bits.FuncDecl .IsStatic = IsStatic;
60786039 }
60796040
@@ -6145,15 +6106,7 @@ class FuncDecl : public AbstractFunctionDecl {
61456106 }
61466107
61476108 OperatorDecl *getOperatorDecl () const ;
6148-
6149- OpaqueTypeDecl *getOpaqueResultTypeDecl () const {
6150- return OpaqueReturn;
6151- }
6152- void setOpaqueResultTypeDecl (OpaqueTypeDecl *decl) {
6153- assert (!OpaqueReturn && " already has opaque type decl"
6154- OpaqueReturn = decl;
6155- }
6156-
6109+
61576110 // / Returns true if the function is forced to be statically dispatched.
61586111 bool hasForcedStaticDispatch () const {
61596112 return Bits.FuncDecl .ForcedStaticDispatch ;
0 commit comments