AST: The body of a GuardStmt is always a BraceStmt

Author: slavapestov

include/swift/AST/Stmt.h

@@ -632,17 +632,17 @@ class IfStmt : public LabeledConditionalStmt {
 ///
 class GuardStmt : public LabeledConditionalStmt {
   SourceLoc GuardLoc;
-  Stmt *Body;
+  BraceStmt *Body;
 
 public:
   GuardStmt(SourceLoc GuardLoc, StmtCondition Cond,
-            Stmt *Body, Optional<bool> implicit = None)
+            BraceStmt *Body, Optional<bool> implicit = None)
   : LabeledConditionalStmt(StmtKind::Guard,
                            getDefaultImplicitFlag(implicit, GuardLoc),
                            LabeledStmtInfo(), Cond),
     GuardLoc(GuardLoc), Body(Body) {}
 
-  GuardStmt(SourceLoc GuardLoc, Expr *Cond, Stmt *Body,
+  GuardStmt(SourceLoc GuardLoc, Expr *Cond, BraceStmt *Body,
             Optional<bool> implicit, ASTContext &Ctx);
 
   SourceLoc getGuardLoc() const { return GuardLoc; }
@@ -654,8 +654,8 @@ class GuardStmt : public LabeledConditionalStmt {
     return Body->getEndLoc();
   }
 
-  Stmt *getBody() const { return Body; }
-  void setBody(Stmt *s) { Body = s; }
+  BraceStmt *getBody() const { return Body; }
+  void setBody(BraceStmt *s) { Body = s; }
 
   // Implement isa/cast/dyncast/etc.
   static bool classof(const Stmt *S) { return S->getKind() == StmtKind::Guard; }

lib/AST/ASTWalker.cpp

@@ -1478,7 +1478,7 @@ Stmt *Traversal::visitGuardStmt(GuardStmt *US) {
   if (doIt(US->getCond()))
     return nullptr;
 
-  if (Stmt *S2 = doIt(US->getBody()))
+  if (BraceStmt *S2 = cast_or_null<BraceStmt>(doIt(US->getBody())))
     US->setBody(S2);
   else
     return nullptr;

lib/AST/Stmt.cpp

@@ -380,7 +380,7 @@ IfStmt::IfStmt(SourceLoc IfLoc, Expr *Cond, Stmt *Then, SourceLoc ElseLoc,
            implicit) {
 }
 
-GuardStmt::GuardStmt(SourceLoc GuardLoc, Expr *Cond, Stmt *Body,
+GuardStmt::GuardStmt(SourceLoc GuardLoc, Expr *Cond, BraceStmt *Body,
                      Optional<bool> implicit, ASTContext &Ctx)
   : GuardStmt(GuardLoc, exprToCond(Cond, Ctx), Body, implicit) {
 

lib/Sema/PCMacro.cpp

@@ -187,8 +187,8 @@ class Instrumenter : InstrumenterBase {
     transformStmtCondition(SC, GS->getStartLoc());
     GS->setCond(SC);
 
-    if (Stmt *BS = GS->getBody())
-      GS->setBody(transformStmt(BS));
+    if (BraceStmt *BS = GS->getBody())
+      GS->setBody(transformBraceStmt(BS));
     return GS;
   }
 

lib/Sema/PlaygroundTransform.cpp

@@ -204,8 +204,8 @@ class Instrumenter : InstrumenterBase {
   }
 
   GuardStmt *transformGuardStmt(GuardStmt *GS) {
-    if (Stmt *BS = GS->getBody())
-      GS->setBody(transformStmt(BS));
+    if (BraceStmt *BS = GS->getBody())
+      GS->setBody(transformBraceStmt(BS));
     return GS;
   }
 

lib/Sema/TypeCheckStmt.cpp

@@ -912,7 +912,7 @@ class StmtChecker : public StmtVisitor<StmtChecker, Stmt*> {
   Stmt *visitGuardStmt(GuardStmt *GS) {
     typeCheckConditionForStatement(GS, DC);
 
-    Stmt *S = GS->getBody();
+    BraceStmt *S = GS->getBody();
     typeCheckStmt(S);
     GS->setBody(S);
     return GS;