wip: remove deprecated methods + comments, handle continue/break in for each

Author: elsakeirouz

include/swift/AST/Stmt.h

@@ -1008,9 +1008,10 @@ class ForEachStmt : public LabeledStmt {
   // Set by Sema:
   ProtocolConformanceRef sequenceConformance = ProtocolConformanceRef();
   Type sequenceType;
-  Expr *nextCall = nullptr;
   BraceStmt *desugaredStmt = nullptr;
   Expr *convertElementExpr = nullptr;
+  LabeledStmt *continueTarget = nullptr;
+  LabeledStmt *breakTarget = nullptr;
 
 public:
   ForEachStmt(LabeledStmtInfo LabelInfo, SourceLoc ForLoc, SourceLoc TryLoc,
@@ -1026,9 +1027,6 @@ class ForEachStmt : public LabeledStmt {
     setPattern(Pat);
   }
 
-  void setNextCall(Expr *next) { nextCall = next; }
-  Expr *getNextCall() const { return nextCall; }
-
   void setConvertElementExpr(Expr *expr) { convertElementExpr = expr; }
   Expr *getConvertElementExpr() const { return convertElementExpr; }
 
@@ -1087,6 +1085,12 @@ class ForEachStmt : public LabeledStmt {
   BraceStmt* desugar();
   BraceStmt* getDesugaredStmt() const { return desugaredStmt; }
   void setDesugaredStmt(BraceStmt* newStmt) { desugaredStmt = newStmt; }
+
+  void setContinueTarget(LabeledStmt *target) { continueTarget = target; }
+  LabeledStmt* getContinueTarget() { return continueTarget; }
+
+  void setBreakTarget(LabeledStmt *target) { breakTarget = target; }
+  LabeledStmt* getBreakTarget() { return breakTarget; }
 };
 
 /// A pattern and an optional guard expression used in a 'case' statement.

lib/SILGen/SILGenStmt.cpp

@@ -1459,6 +1459,8 @@ void StmtEmitter::visitBreakStmt(BreakStmt *S) {
 void SILGenFunction::emitBreakOutOf(SILLocation loc, Stmt *target) {
   // Find the target JumpDest based on the target that sema filled into the
   // stmt.
+  if (isa<ForEachStmt>(target))
+    target = dyn_cast<ForEachStmt>(target)->getBreakTarget();
   for (auto &elt : BreakContinueDestStack) {
     if (target == elt.Target) {
       Cleanups.emitBranchAndCleanups(elt.BreakDest, loc);
@@ -1471,10 +1473,14 @@ void SILGenFunction::emitBreakOutOf(SILLocation loc, Stmt *target) {
 void StmtEmitter::visitContinueStmt(ContinueStmt *S) {
   assert(S->getTarget() && "Sema didn't fill in continue target?");
 
+  auto* target = S->getTarget();
+  if (isa<ForEachStmt>(target))
+    target = dyn_cast<ForEachStmt>(target)->getContinueTarget();
+
   // Find the target JumpDest based on the target that sema filled into the
   // stmt.
   for (auto &elt : SGF.BreakContinueDestStack) {
-    if (S->getTarget() == elt.Target) {
+    if (target == elt.Target) {
       SGF.Cleanups.emitBranchAndCleanups(elt.ContinueDest, S);
       return;
     }

lib/Sema/CSApply.cpp

@@ -9355,13 +9355,6 @@ applySolutionToForEachStmtPreamble(ForEachStmt *stmt,
 
   stmt->setParsedSequence(rewrittenTarget->getAsExpr());
 
-  // FIXME: Next used to be optional but we have to deal w this differently now
-  // This models the gap between the type of the next call and the pattern's
-  // We will be typechecking next separately w the contextual type of the
-  // pattern we already have so this shouldnt be necessary anymore
-  // Convert that std::optional<Element> value to the type of the pattern.
-  // (deleted code here)
-
   // Get the conformance of the sequence type to the Sequence protocol.
   auto sequenceProto = TypeChecker::getProtocol(
       ctx, stmt->getForLoc(),

lib/Sema/TypeCheckStmt.cpp

@@ -3597,6 +3597,8 @@ static BraceStmt *desugarForEachStmt(ForEachStmt* stmt){
   // FIXME: do we need to do anything extra here or elseswhere if the for each
   // stmt is async?
   auto* whileStmt = new (ctx) WhileStmt(stmt->getLabelInfo(), SourceLoc(), ctx.AllocateCopy(cond), whileBody, true);
+  stmt->setBreakTarget(whileStmt);
+  stmt->setContinueTarget(whileStmt);
 
   SmallVector<ASTNode, 2> stmts;
   stmts.push_back(PB);