Merge pull request #85507 from hamishknight/err-fix

[CS] Fix a couple of missing error paths

Author: hamishknight

lib/Sema/CSSyntacticElement.cpp

@@ -2212,6 +2212,8 @@ class SyntacticElementSolutionApplication
 
     if (auto newResultTarget = rewriter.rewriteTarget(target)) {
       resultExpr = newResultTarget->getAsExpr();
+    } else {
+      hadError = true;
     }
 
     switch (mode) {
@@ -2259,8 +2261,11 @@ class SyntacticElementSolutionApplication
     }
 
     auto *resultExpr = thenStmt->getResult();
-    if (auto newResultTarget = rewriter.rewriteTarget(*target))
+    if (auto newResultTarget = rewriter.rewriteTarget(*target)) {
       resultExpr = newResultTarget->getAsExpr();
+    } else {
+      hadError = true;
+    }
 
     thenStmt->setResult(resultExpr);
 

validation-test/compiler_crashers/DiagnoseWalker-walkToExprPre-50b7d0.swift renamed to validation-test/compiler_crashers_fixed/DiagnoseWalker-walkToExprPre-50b7d0.swift

@@ -1,5 +1,5 @@
 // {"kind":"typecheck","original":"7f0c85e8","signature":"diagSyntacticUseRestrictions(swift::Expr const*, swift::DeclContext const*, bool)::DiagnoseWalker::walkToExprPre(swift::Expr*)","signatureAssert":"Assertion failed: (Ptr && \"Cannot dereference a null Type!\"), function operator->"}
-// RUN: not --crash %target-swift-frontend -typecheck %s
+// RUN: not %target-swift-frontend -typecheck %s
 class a<b, c>: ExpressibleByDictionaryLiteral {
   typealias Key = b
   typealias Value = c

validation-test/compiler_crashers/ImplicitSelfUsageChecker-isClosureRequiringSelfQualification-ef6fa0.swift renamed to validation-test/compiler_crashers_fixed/ImplicitSelfUsageChecker-isClosureRequiringSelfQualification-ef6fa0.swift

@@ -1,5 +1,5 @@
 // {"kind":"typecheck","signature":"(anonymous namespace)::ImplicitSelfUsageChecker::isClosureRequiringSelfQualification(swift::AbstractClosureExpr const*, bool)","signatureAssert":"Assertion failed: (Ptr && \"Cannot dereference a null Type!\"), function operator->"}
-// RUN: not --crash %target-swift-frontend -typecheck %s
+// RUN: not %target-swift-frontend -typecheck %s
 struct a : ExpressibleByBooleanLiteral {
   c(d : Bool -> (
 }