---

yaml
---
r: 326103
b: refs/heads/master-next
c: 3d058c6
h: refs/heads/master
i:
  326101: 5fb7154
  326099: 4bac967
  326095: 3f23d57

Author: theblixguy

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: e052da7d8886fa0439677852e8f7830b20c2e1da
-refs/heads/master-next: d9c8ae4ce85ac04369d14fa67dc3f56efdd62ef1
+refs/heads/master-next: 3d058c6b4ff9e5286ad3db68a109692a713814ec
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/lib/Sema/TypeCheckDecl.cpp

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