Merge pull request #2974 from benlangmuir/return-range

swift-ci · swift-ci · commit 0c5b245712d9 · 2016-06-09T14:05:05.000-07:00
diff --git a/lib/AST/Stmt.cpp b/lib/AST/Stmt.cpp
@@ -153,7 +153,9 @@ SourceLoc ReturnStmt::getStartLoc() const {
   return ReturnLoc;
 }
 SourceLoc ReturnStmt::getEndLoc() const {
-  return (Result ? Result->getEndLoc() : ReturnLoc);
+  if (Result && Result->getEndLoc().isValid())
+    return Result->getEndLoc();
+  return ReturnLoc;
 }
 
 SourceLoc ThrowStmt::getEndLoc() const { return SubExpr->getEndLoc(); }

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,9 @@ SourceLoc ReturnStmt::getStartLoc() const {`
`153`	`153`	`return ReturnLoc;`
`154`	`154`	`}`
`155`	`155`	`SourceLoc ReturnStmt::getEndLoc() const {`
`156`		`- return (Result ? Result->getEndLoc() : ReturnLoc);`
	`156`	`+ if (Result && Result->getEndLoc().isValid())`
	`157`	`+ return Result->getEndLoc();`
	`158`	`+ return ReturnLoc;`
`157`	`159`	`}`
`158`	`160`
`159`	`161`	`SourceLoc ThrowStmt::getEndLoc() const { return SubExpr->getEndLoc(); }`