Merge pull request #67701 from hamishknight/small-fixes

A couple of small fixes

Author: swift-ci

include/swift/AST/ExprNodes.def

@@ -213,7 +213,8 @@ UNCHECKED_EXPR(OneWay, Expr)
 EXPR(Tap, Expr)
 UNCHECKED_EXPR(TypeJoin, Expr)
 EXPR(MacroExpansion, Expr)
-LAST_EXPR(TypeJoin)
+// Don't forget to update the LAST_EXPR below when adding a new Expr here.
+LAST_EXPR(MacroExpansion)
 
 #undef EXPR_RANGE
 #undef LITERAL_EXPR

lib/Sema/CSSimplify.cpp

@@ -6620,6 +6620,7 @@ bool ConstraintSystem::repairFailures(
 
     conversionsOrFixes.push_back(IgnoreContextualType::create(
         *this, lhs, rhs, getConstraintLocator(anchor)));
+    break;
   }
   default:
     break;