[AST] Remove isTypeContext() check from hasValueSemantics() and move the responsibility to the caller

Author: theblixguy

lib/AST/Decl.cpp

@@ -5708,8 +5708,9 @@ void VarDecl::emitLetToVarNoteIfSimple(DeclContext *UseDC) const {
         if (AD->isGetter() && !AD->getAccessorKeywordLoc().isValid())
           return;
 
+        auto accessorDC = AD->getDeclContext();
         // Do not suggest the fix-it if `Self` is a class type.
-        if (!AD->getDeclContext()->hasValueSemantics()) {
+        if (accessorDC->isTypeContext() && !accessorDC->hasValueSemantics()) {
           return;
         }
       }

lib/AST/DeclContext.cpp

@@ -1025,9 +1025,6 @@ DeclContextKind DeclContext::getContextKind() const {
 }
 
 bool DeclContext::hasValueSemantics() const {
-  if (!isTypeContext())
-    return false;
-	
   if (auto contextTy = getSelfTypeInContext()) {
     return !contextTy->hasReferenceSemantics();
   }

lib/Sema/TypeCheckDecl.cpp

@@ -1959,7 +1959,9 @@ void TypeChecker::validateDecl(OperatorDecl *OD) {
 llvm::Expected<SelfAccessKind>
 SelfAccessKindRequest::evaluate(Evaluator &evaluator, FuncDecl *FD) const {
   if (FD->getAttrs().getAttribute<MutatingAttr>(true)) {
-    if (!FD->isInstanceMember() || !FD->getDeclContext()->hasValueSemantics()) {
+    auto functionDC = FD->getDeclContext();
+    if (!FD->isInstanceMember() ||
+        (functionDC->isTypeContext() && !functionDC->hasValueSemantics())) {
       return SelfAccessKind::NonMutating;
     }
     return SelfAccessKind::Mutating;
@@ -1981,7 +1983,9 @@ SelfAccessKindRequest::evaluate(Evaluator &evaluator, FuncDecl *FD) const {
     case AccessorKind::MutableAddress:
     case AccessorKind::Set:
     case AccessorKind::Modify:
-      if (AD->isInstanceMember() && AD->getDeclContext()->hasValueSemantics())
+      auto accessorDC = AD->getDeclContext();
+      if (AD->isInstanceMember() && accessorDC->isTypeContext() &&
+          accessorDC->hasValueSemantics())
         return SelfAccessKind::Mutating;
       break;
 

lib/Sema/TypeCheckStorage.cpp

@@ -268,8 +268,9 @@ void swift::validatePatternBindingEntries(TypeChecker &tc,
 llvm::Expected<bool>
 IsGetterMutatingRequest::evaluate(Evaluator &evaluator,
                                   AbstractStorageDecl *storage) const {
-  bool result =
-      (!storage->isStatic() && storage->getDeclContext()->hasValueSemantics());
+  auto storageDC = storage->getDeclContext();
+  bool result = (!storage->isStatic() && storageDC->isTypeContext() &&
+                 storageDC->hasValueSemantics());
 
   // 'lazy' overrides the normal accessor-based rules and heavily
   // restricts what accessors can be used.  The getter is considered
@@ -297,7 +298,7 @@ IsGetterMutatingRequest::evaluate(Evaluator &evaluator,
 
   // Protocol requirements are always written as '{ get }' or '{ get set }';
   // the @_borrowed attribute determines if getReadImpl() becomes Get or Read.
-  if (isa<ProtocolDecl>(storage->getDeclContext()))
+  if (isa<ProtocolDecl>(storageDC))
     return checkMutability(AccessorKind::Get);
 
   switch (storage->getReadImpl()) {
@@ -323,8 +324,9 @@ 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() && storage->getDeclContext()->hasValueSemantics());
+  auto storageDC = storage->getDeclContext();
+  bool result = (!storage->isStatic() && storageDC->isTypeContext() &&
+                 storageDC->hasValueSemantics());
 
   // If we have an attached property wrapper, the setter is mutating
   // or not based on the composition of the wrappers.