Merge pull request #24546 from nate-chandler/nate/omit-return-pr-fixes

Address PR comments on return omission.
swiftlang · May 7, 2019 · 5e7f06d · 5e7f06d
2 parents 49710ab + 1267f65
commit 5e7f06d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
@@ -5694,9 +5694,7 @@ void Parser::parseAbstractFunctionBody(AbstractFunctionDecl *AFD) {
     if (!Body.hasCodeCompletion() && BS->getNumElements() == 1) {
       auto Element = BS->getElement(0);
       if (auto *stmt = Element.dyn_cast<Stmt *>()) {
-        auto kind = AFD->getKind();
-        if (kind == DeclKind::Var || kind == DeclKind::Subscript ||
-            kind == DeclKind::Func ) {
+        if (isa<FuncDecl>(AFD)) {
           if (auto *returnStmt = dyn_cast<ReturnStmt>(stmt)) {
             if (!returnStmt->hasResult()) {
               auto returnExpr = TupleExpr::createEmpty(Context,

diff --git a/lib/SILOptimizer/Mandatory/DataflowDiagnostics.cpp b/lib/SILOptimizer/Mandatory/DataflowDiagnostics.cpp
@@ -63,7 +63,7 @@ static void diagnoseMissingReturn(const UnreachableInst *UI,
   if (numElements > 0) {
     auto element = BS->getElement(numElements - 1);
     if (auto expr = element.dyn_cast<Expr *>()) {
-      if (expr->getType()->getCanonicalType() == ResTy->getCanonicalType()) {
+      if (expr->getType()->isEqual(ResTy)) {
         Context.Diags.diagnose(
           expr->getStartLoc(),
           diag::missing_return_last_expr, ResTy,