Merge pull request #21319 from davezarzycki/ice_aware_returnstmt_checking

slavapestov · web-flow · commit 77dc2e892580 · 2018-12-17T14:41:18.000-05:00
[Sema] ReturnStmt must be ImplicitConversionExpr aware
diff --git a/lib/Sema/TypeCheckStmt.cpp b/lib/Sema/TypeCheckStmt.cpp
@@ -471,6 +471,8 @@ class StmtChecker : public StmtVisitor<StmtChecker, Stmt*> {
       tryDiagnoseUnnecessaryCastOverOptionSet(TC.Context, E, ResultTy,
                                               DC->getParentModule());
     }
+    while (auto ICE = dyn_cast<ImplicitConversionExpr>(E))
+      E = ICE->getSubExpr();
     if (auto DRE = dyn_cast<DeclRefExpr>(E))
       if (auto FD = dyn_cast<FuncDecl>(DRE->getDecl()))
         TC.addEscapingFunctionAsReturnValue(FD, RS);

Original file line number	Diff line number	Diff line change
`@@ -471,6 +471,8 @@ class StmtChecker : public StmtVisitor<StmtChecker, Stmt*> {`
`471`	`471`	`tryDiagnoseUnnecessaryCastOverOptionSet(TC.Context, E, ResultTy,`
`472`	`472`	`DC->getParentModule());`
`473`	`473`	`}`
	`474`	`+ while (auto ICE = dyn_cast<ImplicitConversionExpr>(E))`
	`475`	`+ E = ICE->getSubExpr();`
`474`	`476`	`if (auto DRE = dyn_cast<DeclRefExpr>(E))`
`475`	`477`	`if (auto FD = dyn_cast<FuncDecl>(DRE->getDecl()))`
`476`	`478`	`TC.addEscapingFunctionAsReturnValue(FD, RS);`