---

yaml
---
r: 346105
b: refs/heads/master
c: dc3b5d8
h: refs/heads/master
i:
  346103: fdceacc

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 9631c2aac1b4c915a268eaa57e48e2681b6f74cf
+refs/heads/master: dc3b5d807e421d468184ae07a630f8598749ba54
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/include/swift/AST/Decl.h

@@ -5631,10 +5631,6 @@ class FuncDecl : public AbstractFunctionDecl {
     return getSelfAccessKind() == SelfAccessKind::__Consuming;
   }
 
-  TypeLoc getReturnTypeLoc() const {
-    return FnRetType;
-  }
-  
   SelfAccessKind getSelfAccessKind() const {
     return static_cast<SelfAccessKind>(Bits.FuncDecl.SelfAccess);
   }

trunk/lib/IDE/SyntaxModel.cpp

@@ -749,7 +749,7 @@ bool ModelASTWalker::walkToDeclPre(Decl *D) {
                         AFD->getSignatureSourceRange());
     if (FD) {
       SN.TypeRange = charSourceRangeFromSourceRange(SM,
-                                    FD->getReturnTypeLoc().getSourceRange());
+                                    FD->getBodyResultTypeLoc().getSourceRange());
     }
     pushStructureNode(SN, AFD);
   } else if (auto *NTD = dyn_cast<NominalTypeDecl>(D)) {

trunk/lib/Sema/TypeCheckProtocol.cpp

@@ -4940,7 +4940,7 @@ diagnoseMissingAppendInterpolationMethod(TypeChecker &tc,
         break;
 
       case InvalidMethod::Reason::ReturnType:
-        tc.diagnose(invalidMethod.method->getReturnTypeLoc().getLoc(),
+        tc.diagnose(invalidMethod.method->getBodyResultTypeLoc().getLoc(),
                     diag::append_interpolation_void_or_discardable)
             .fixItInsert(invalidMethod.method->getStartLoc(),
                          "@discardableResult ");