[AST] Adds 'hasValueSemantics()' to DeclContext and uses 'getSelfTypeInContext()' instead

Author: theblixguy

include/swift/AST/DeclContext.h

@@ -261,7 +261,10 @@ class alignas(1 << DeclContextAlignInBits) DeclContext {
 
   /// Returns the kind of context this is.
   DeclContextKind getContextKind() const;
-  
+
+  /// Returns whether this context has value semantics.
+  bool hasValueSemantics() const;
+
   /// Determines whether this context is itself a local scope in a
   /// code block.  A context that appears in such a scope, like a
   /// local type declaration, does not itself become a local context.

lib/AST/Decl.cpp

@@ -5709,9 +5709,7 @@ void VarDecl::emitLetToVarNoteIfSimple(DeclContext *UseDC) const {
           return;
 
         // Do not suggest the fix-it if `Self` is a class type.
-        if (AD->getDeclContext()
-                ->getSelfTypeInContext()
-                ->isAnyClassReferenceType()) {
+        if (!AD->getDeclContext()->hasValueSemantics()) {
           return;
         }
       }

lib/AST/DeclContext.cpp

@@ -1024,6 +1024,14 @@ DeclContextKind DeclContext::getContextKind() const {
   llvm_unreachable("Unhandled DeclContext ASTHierarchy");
 }
 
+bool DeclContext::hasValueSemantics() const {
+  if (auto contextTy = getSelfTypeInContext()) {
+    return !contextTy->hasReferenceSemantics();
+  }
+
+  return false;
+}
+
 SourceLoc swift::extractNearestSourceLoc(const DeclContext *dc) {
   switch (dc->getContextKind()) {
   case DeclContextKind::AbstractFunctionDecl:

lib/Sema/TypeCheckDecl.cpp

@@ -1956,26 +1956,10 @@ void TypeChecker::validateDecl(OperatorDecl *OD) {
   }
 }
 
-bool swift::doesContextHaveValueSemantics(DeclContext *dc) {
-  if (Type contextTy = dc->getDeclaredInterfaceType()) {
-    // If the decl context is an extension, then it could be imposing a class
-    // constraint (ex: where Self: SomeClass). Make sure we include that
-    // in our check as well.
-    auto extensionRequiresClass = false;
-    if (auto ED = dyn_cast<ExtensionDecl>(dc)) {
-      extensionRequiresClass =
-          ED->getGenericSignature()->requiresClass(ED->getSelfInterfaceType());
-    }
-    return !contextTy->hasReferenceSemantics() && !extensionRequiresClass;
-  }
-  return false;
-}
-
 llvm::Expected<SelfAccessKind>
 SelfAccessKindRequest::evaluate(Evaluator &evaluator, FuncDecl *FD) const {
   if (FD->getAttrs().getAttribute<MutatingAttr>(true)) {
-    if (!FD->isInstanceMember() ||
-        !doesContextHaveValueSemantics(FD->getDeclContext())) {
+    if (!FD->isInstanceMember() || !FD->getDeclContext()->hasValueSemantics()) {
       return SelfAccessKind::NonMutating;
     }
     return SelfAccessKind::Mutating;
@@ -1997,8 +1981,7 @@ SelfAccessKindRequest::evaluate(Evaluator &evaluator, FuncDecl *FD) const {
     case AccessorKind::MutableAddress:
     case AccessorKind::Set:
     case AccessorKind::Modify:
-      if (AD->isInstanceMember() &&
-          doesContextHaveValueSemantics(AD->getDeclContext()))
+      if (AD->isInstanceMember() && AD->getDeclContext()->hasValueSemantics())
         return SelfAccessKind::Mutating;
       break;
 

lib/Sema/TypeCheckDecl.h

@@ -25,8 +25,6 @@ class DeclContext;
 class ValueDecl;
 class Pattern;
 
-bool doesContextHaveValueSemantics(DeclContext *dc);
-
 /// Walks up the override chain for \p CD until it finds an initializer that is
 /// required and non-implicit. If no such initializer exists, returns the
 /// declaration where \c required was introduced (i.e. closest to the root

lib/Sema/TypeCheckStorage.cpp

@@ -268,8 +268,8 @@ void swift::validatePatternBindingEntries(TypeChecker &tc,
 llvm::Expected<bool>
 IsGetterMutatingRequest::evaluate(Evaluator &evaluator,
                                   AbstractStorageDecl *storage) const {
-  bool result = (!storage->isStatic() &&
-                 doesContextHaveValueSemantics(storage->getDeclContext()));
+  bool result =
+      (!storage->isStatic() && storage->getDeclContext()->hasValueSemantics());
 
   // 'lazy' overrides the normal accessor-based rules and heavily
   // restricts what accessors can be used.  The getter is considered
@@ -323,8 +323,8 @@ IsSetterMutatingRequest::evaluate(Evaluator &evaluator,
                                   AbstractStorageDecl *storage) const {
   // By default, the setter is mutating if we have an instance member of a
   // value type, but this can be overridden below.
-  bool result = (!storage->isStatic() &&
-                 doesContextHaveValueSemantics(storage->getDeclContext()));
+  bool result =
+      (!storage->isStatic() && storage->getDeclContext()->hasValueSemantics());
 
   // If we have an attached property wrapper, the setter is mutating
   // or not based on the composition of the wrappers.