other loop kinds in progress

Author: ojhunt

clang/lib/Parse/ParseExprCXX.cpp

@@ -1877,10 +1877,8 @@ Parser::ParseCXXCondition(StmtResult *InitStmt, SourceLocation Loc,
   struct ForConditionScopeRAII {
     Scope *S;
     void enter(bool IsConditionVariable) {
-      if (S) {
-        S->AddFlags(Scope::BreakScope | Scope::ContinueScope);
+      if (S)
         S->setIsConditionVarScope(IsConditionVariable);
-      }
     }
     ~ForConditionScopeRAII() {
       if (S)

clang/lib/Parse/ParseStmt.cpp

@@ -1728,12 +1728,11 @@ StmtResult Parser::ParseWhileStatement(SourceLocation *TrailingElseLoc) {
   // while, for, and switch statements are local to the if, while, for, or
   // switch statement (including the controlled statement).
   //
-  unsigned ScopeFlags;
+  unsigned ScopeFlags = 0;
   if (C99orCXX)
-    ScopeFlags = Scope::BreakScope | Scope::ContinueScope |
-                 Scope::DeclScope  | Scope::ControlScope;
-  else
-    ScopeFlags = Scope::BreakScope | Scope::ContinueScope;
+    ScopeFlags = Scope::DeclScope  | Scope::ControlScope;
+
+  ParseScope WhileScope(this, ScopeFlags);
 
   // Parse the condition.
   Sema::ConditionResult Cond;
@@ -1743,7 +1742,7 @@ StmtResult Parser::ParseWhileStatement(SourceLocation *TrailingElseLoc) {
                                 Sema::ConditionKind::Boolean, LParen, RParen))
     return StmtError();
 
-  ParseScope WhileScope(this, ScopeFlags);
+  getCurScope()->AddFlags(Scope::BreakScope | Scope::ContinueScope);
 
   // OpenACC Restricts a while-loop inside of certain construct/clause
   // combinations, so diagnose that here in OpenACC mode.
@@ -1839,6 +1838,8 @@ StmtResult Parser::ParseDoStatement() {
   // A do-while expression is not a condition, so can't have attributes.
   DiagnoseAndSkipCXX11Attributes();
 
+  DoScope.Exit();
+
   SourceLocation Start = Tok.getLocation();
   ExprResult Cond = ParseExpression();
   if (!Cond.isUsable()) {
@@ -1849,7 +1850,6 @@ StmtResult Parser::ParseDoStatement() {
         Actions.getASTContext().BoolTy);
   }
   T.consumeClose();
-  DoScope.Exit();
 
   if (Cond.isInvalid() || Body.isInvalid())
     return StmtError();
@@ -2124,9 +2124,6 @@ StmtResult Parser::ParseForStatement(SourceLocation *TrailingElseLoc) {
         }
 
       } else {
-        // We permit 'continue' and 'break' in the condition of a for loop.
-        getCurScope()->AddFlags(Scope::BreakScope | Scope::ContinueScope);
-
         ExprResult SecondExpr = ParseExpression();
         if (SecondExpr.isInvalid())
           SecondPart = Sema::ConditionError();
@@ -2138,11 +2135,6 @@ StmtResult Parser::ParseForStatement(SourceLocation *TrailingElseLoc) {
     }
   }
 
-  // Enter a break / continue scope, if we didn't already enter one while
-  // parsing the second part.
-  if (!getCurScope()->isContinueScope())
-    getCurScope()->AddFlags(Scope::BreakScope | Scope::ContinueScope);
-
   // Parse the third part of the for statement.
   if (!ForEach && !ForRangeInfo.ParsedForRangeDecl()) {
     if (Tok.isNot(tok::semi)) {
@@ -2165,6 +2157,8 @@ StmtResult Parser::ParseForStatement(SourceLocation *TrailingElseLoc) {
   // Match the ')'.
   T.consumeClose();
 
+  getCurScope()->AddFlags(Scope::BreakScope | Scope::ContinueScope);
+
   // C++ Coroutines [stmt.iter]:
   //   'co_await' can only be used for a range-based for statement.
   if (CoawaitLoc.isValid() && !ForRangeInfo.ParsedForRangeDecl()) {

clang/test/CoverageMapping/break.c

@@ -31,14 +31,3 @@ int main(void) {     // CHECK: File 0, [[@LINE]]:16 -> {{[0-9]+}}:2 = #0
     ++cnt;
   }
 }
-
-// CHECK-LABEL: break_continue_in_increment:
-// CHECK:  [[@LINE+6]]:11 -> [[@LINE+6]]:45 = #1
-// CHECK:  [[@LINE+5]]:18 -> [[@LINE+5]]:19 = #1
-// CHECK:  [[@LINE+4]]:21 -> [[@LINE+4]]:26 = #2
-// CHECK:  [[@LINE+3]]:33 -> [[@LINE+3]]:41 = (#1 - #2)
-// CHECK:  [[@LINE+3]]:5 -> [[@LINE+3]]:6 = #1
-void break_continue_in_increment(int x) {
-  for (;; ({ if (x) break; else continue; }))
-    ;
-}

clang/test/Sema/loop-condition-continue-scopes.c

@@ -0,0 +1,28 @@
+// RUN: %clang_cc1 -fsyntax-only -verify %s 
+
+void f() {
+  while (({ continue; 1; })) {}
+  // expected-error@-1 {{'continue' statement not in loop statement}}
+  while (({ break; 1; })) {}
+  // expected-error@-1 {{'break' statement not in loop or switch statement}}
+  do {} while (({ break; 1; }));
+  // expected-error@-1 {{'break' statement not in loop or switch statement}}
+  do {} while (({ continue; 1;}));
+  // expected-error@-1 {{'continue' statement not in loop statement}}
+  for (({ continue; });;) {}
+  // expected-error@-1 {{'continue' statement not in loop statement}}
+  for (;({ continue; 1;});) {}
+  // expected-error@-1 {{'continue' statement not in loop statement}}
+  for (;;({ continue;})) {}
+  // expected-error@-1 {{'continue' statement not in loop statement}}
+  for (({ break;});;) {}
+  // expected-error@-1 {{'break' statement not in loop or switch statement}}
+  for (;({ break; 1;});) {}
+  // expected-error@-1 {{'break' statement not in loop or switch statement}}
+  for (;;({ break;})) {}
+  // expected-error@-1 {{'break' statement not in loop or switch statement}}
+  switch(({break;1;})){
+  // expected-error@-1 {{'break' statement not in loop or switch statement}}
+    case 1: break;
+  }
+}