r352933 - Revert "[AST][OpenMP] OpenMP Sections / Section constructs contain Structured blocks"

[Roman Lebedev via cfe-commits]

Author: lebedevri
Date: Fri Feb  1 14:43:08 2019
New Revision: 352933

URL: http://llvm.org/viewvc/llvm-project?rev=352933&view=rev
Log:
Revert "[AST][OpenMP] OpenMP Sections / Section constructs contain Structured blocks"

Further reviews (D57594, D57615) have revealed that this was not reviewed,
and that the differential's description was not read during the review,
thus rendering this commit invalid.

This reverts commit r352882.

Removed:
    cfe/trunk/test/AST/ast-dump-openmp-sections.cpp
Modified:
    cfe/trunk/lib/Sema/SemaOpenMP.cpp

Modified: cfe/trunk/lib/Sema/SemaOpenMP.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaOpenMP.cpp?rev=352933&r1=352932&r2=352933&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaOpenMP.cpp (original)
+++ cfe/trunk/lib/Sema/SemaOpenMP.cpp Fri Feb  1 14:43:08 2019
@@ -5971,13 +5971,6 @@ StmtResult Sema::ActOnOpenMPSectionsDire
     return StmtError();
   }
 
-  // 1.2.2 OpenMP Language Terminology
-  // Structured block - An executable statement with a single entry at the
-  // top and a single exit at the bottom.
-  // The point of exit cannot be a branch out of the structured block.
-  // longjmp() and throw() must not violate the entry/exit criteria.
-  cast<CapturedStmt>(AStmt)->getCapturedDecl()->setNothrow();
-
   setFunctionHasBranchProtectedScope();
 
   return OMPSectionsDirective::Create(Context, StartLoc, EndLoc, Clauses, AStmt,
@@ -5992,13 +5985,6 @@ StmtResult Sema::ActOnOpenMPSectionDirec
 
   assert(isa<CapturedStmt>(AStmt) && "Captured statement expected");
 
-  // 1.2.2 OpenMP Language Terminology
-  // Structured block - An executable statement with a single entry at the
-  // top and a single exit at the bottom.
-  // The point of exit cannot be a branch out of the structured block.
-  // longjmp() and throw() must not violate the entry/exit criteria.
-  cast<CapturedStmt>(AStmt)->getCapturedDecl()->setNothrow();
-
   setFunctionHasBranchProtectedScope();
   DSAStack->setParentCancelRegion(DSAStack->isCancelRegion());
 

Removed: cfe/trunk/test/AST/ast-dump-openmp-sections.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/AST/ast-dump-openmp-sections.cpp?rev=352932&view=auto
==============================================================================
--- cfe/trunk/test/AST/ast-dump-openmp-sections.cpp (original)
+++ cfe/trunk/test/AST/ast-dump-openmp-sections.cpp (removed)
@@ -1,57 +0,0 @@
-// RUN: %clang_cc1 -verify -fopenmp -ast-dump %s | FileCheck %s
-// RUN: %clang_cc1 -verify -fopenmp-simd -ast-dump %s | FileCheck %s
-// expected-no-diagnostics
-
-void sections() {
-#pragma omp sections
-  {
-#pragma omp section
-    {
-    }
-#pragma omp section
-    {
-    }
-  }
-}
-
-// CHECK: `-FunctionDecl
-// CHECK-NEXT:   `-CompoundStmt
-// CHECK-NEXT:     `-OMPSectionsDirective
-// CHECK-NEXT:       `-CapturedStmt
-// CHECK-NEXT:         `-CapturedDecl {{.*}} nothrow
-// CHECK-NEXT:           |-CompoundStmt
-// CHECK-NEXT:           | |-OMPSectionDirective
-// CHECK-NEXT:           | | `-CapturedStmt
-// CHECK-NEXT:           | |   `-CapturedDecl {{.*}} nothrow
-// CHECK-NEXT:           | |     |-CompoundStmt
-// CHECK-NEXT:           | |     `-ImplicitParamDecl
-// CHECK-NEXT:           | `-OMPSectionDirective
-// CHECK-NEXT:           |   `-CapturedStmt
-// CHECK-NEXT:           |     `-CapturedDecl {{.*}} nothrow
-// CHECK-NEXT:           |       |-CompoundStmt
-// CHECK-NEXT:           |       `-ImplicitParamDecl
-// CHECK-NEXT:           |-ImplicitParamDecl
-// CHECK-NEXT:           |-CXXRecordDecl
-// CHECK-NEXT:           | |-DefinitionData
-// CHECK-NEXT:           | | |-DefaultConstructor
-// CHECK-NEXT:           | | |-CopyConstructor
-// CHECK-NEXT:           | | |-MoveConstructor
-// CHECK-NEXT:           | | |-CopyAssignment
-// CHECK-NEXT:           | | |-MoveAssignment
-// CHECK-NEXT:           | | `-Destructor
-// CHECK-NEXT:           | `-CapturedRecordAttr
-// CHECK-NEXT:           |-CapturedDecl {{.*}} nothrow
-// CHECK-NEXT:           | |-CompoundStmt
-// CHECK-NEXT:           | `-ImplicitParamDecl
-// CHECK-NEXT:           |-CXXRecordDecl
-// CHECK-NEXT:           | |-DefinitionData
-// CHECK-NEXT:           | | |-DefaultConstructor
-// CHECK-NEXT:           | | |-CopyConstructor
-// CHECK-NEXT:           | | |-MoveConstructor
-// CHECK-NEXT:           | | |-CopyAssignment
-// CHECK-NEXT:           | | |-MoveAssignment
-// CHECK-NEXT:           | | `-Destructor
-// CHECK-NEXT:           | `-CapturedRecordAttr
-// CHECK-NEXT:           `-CapturedDecl {{.*}} nothrow
-// CHECK-NEXT:             |-CompoundStmt
-// CHECK-NEXT:             `-ImplicitParamDecl