Merge pull request #38212 from CodaFi/defuse-refuse

swift-ci · web-flow · commit 850a84aa2b3a · 2021-07-01T20:30:07.000-07:00
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
@@ -6570,9 +6570,12 @@ Expr *ParamDecl::getTypeCheckedDefaultExpr() const {
   }
 
   auto &ctx = getASTContext();
-  return evaluateOrDefault(
-      ctx.evaluator, DefaultArgumentExprRequest{const_cast<ParamDecl *>(this)},
-      new (ctx) ErrorExpr(getSourceRange(), ErrorType::get(ctx)));
+  if (Expr *E = evaluateOrDefault(
+          ctx.evaluator,
+          DefaultArgumentExprRequest{const_cast<ParamDecl *>(this)}, nullptr)) {
+    return E;
+  }
+  return new (ctx) ErrorExpr(getSourceRange(), ErrorType::get(ctx));
 }
 
 void ParamDecl::setDefaultExpr(Expr *E, bool isTypeChecked) {

Original file line number	Diff line number	Diff line change
`@@ -6570,9 +6570,12 @@ Expr *ParamDecl::getTypeCheckedDefaultExpr() const {`
`6570`	`6570`	`}`
`6571`	`6571`
`6572`	`6572`	`auto &ctx = getASTContext();`
`6573`		`- return evaluateOrDefault(`
`6574`		`- ctx.evaluator, DefaultArgumentExprRequest{const_cast<ParamDecl *>(this)},`
`6575`		`- new (ctx) ErrorExpr(getSourceRange(), ErrorType::get(ctx)));`
	`6573`	`+ if (Expr *E = evaluateOrDefault(`
	`6574`	`+ ctx.evaluator,`
	`6575`	`+ DefaultArgumentExprRequest{const_cast<ParamDecl *>(this)}, nullptr)) {`
	`6576`	`+ return E;`
	`6577`	`+ }`
	`6578`	`+ return new (ctx) ErrorExpr(getSourceRange(), ErrorType::get(ctx));`
`6576`	`6579`	`}`
`6577`	`6580`
`6578`	`6581`	`void ParamDecl::setDefaultExpr(Expr *E, bool isTypeChecked) {`