Remove unused attribute from OMPCanonicalLoopSequenceTransformationDirective

When I refactored the hierarchy I had the impression it would be used
but it is not.

Also remove a stray NumGeneratedLoopNests field in OMPFuseDirective that
I forgot to remove during the refactoring.

Author: rofirrim

clang/include/clang/AST/StmtOpenMP.h

@@ -5966,21 +5966,14 @@ class OMPCanonicalLoopSequenceTransformationDirective
       public OMPLoopTransformationDirective {
   friend class ASTStmtReader;
 
-  /// Number of loops contained in the canonical loop sequence.
-  unsigned NumLoopsInSequence = 1;
-
 protected:
   explicit OMPCanonicalLoopSequenceTransformationDirective(
       StmtClass SC, OpenMPDirectiveKind Kind, SourceLocation StartLoc,
-      SourceLocation EndLoc, unsigned NumLoopsInSequence)
+      SourceLocation EndLoc)
       : OMPExecutableDirective(SC, Kind, StartLoc, EndLoc),
-        OMPLoopTransformationDirective(this),
-        NumLoopsInSequence(NumLoopsInSequence) {}
+        OMPLoopTransformationDirective(this) {}
 
 public:
-  /// Returns the number of canonical loop nests contained in this sequence.
-  unsigned getNumLoopsInSequence() const { return NumLoopsInSequence; }
-
   /// Get the de-sugared statements after the loop transformation.
   ///
   /// Might be nullptr if either the directive generates no loops and is handled
@@ -6018,13 +6011,9 @@ class OMPFuseDirective final
     TransformedStmtOffset,
   };
 
-  unsigned NumGeneratedLoopNests = 1;
-
-  explicit OMPFuseDirective(SourceLocation StartLoc, SourceLocation EndLoc,
-                            unsigned NumLoopsInSequence)
+  explicit OMPFuseDirective(SourceLocation StartLoc, SourceLocation EndLoc)
       : OMPCanonicalLoopSequenceTransformationDirective(
-            OMPFuseDirectiveClass, llvm::omp::OMPD_fuse, StartLoc, EndLoc,
-            NumLoopsInSequence) {}
+            OMPFuseDirectiveClass, llvm::omp::OMPD_fuse, StartLoc, EndLoc) {}
 
   void setPreInits(Stmt *PreInits) {
     Data->getChildren()[PreInitsOffset] = PreInits;
@@ -6051,17 +6040,16 @@ class OMPFuseDirective final
   /// \param PreInits Helper preinits statements for the loop nest
   static OMPFuseDirective *
   Create(const ASTContext &C, SourceLocation StartLoc, SourceLocation EndLoc,
-         ArrayRef<OMPClause *> Clauses, unsigned NumLoops,
-         unsigned NumGeneratedTopLevelLoops, Stmt *AssociatedStmt,
-         Stmt *TransformedStmt, Stmt *PreInits);
+         ArrayRef<OMPClause *> Clauses, unsigned NumGeneratedTopLevelLoops,
+         Stmt *AssociatedStmt, Stmt *TransformedStmt, Stmt *PreInits);
 
   /// Build an empty '#pragma omp fuse' AST node for deserialization
   ///
   /// \param C Context of the AST
   /// \param NumClauses Number of clauses to allocate
   /// \param NumLoops Number of top level loops to allocate
-  static OMPFuseDirective *CreateEmpty(const ASTContext &C, unsigned NumClauses,
-                                       unsigned NumLoops);
+  static OMPFuseDirective *CreateEmpty(const ASTContext &C,
+                                       unsigned NumClauses);
 
   /// Gets the associated loops after the transformation. This is the de-sugared
   /// replacement or nulltpr in dependent contexts.

clang/lib/AST/StmtOpenMP.cpp

@@ -552,28 +552,24 @@ OMPInterchangeDirective::CreateEmpty(const ASTContext &C, unsigned NumClauses,
       SourceLocation(), SourceLocation(), NumLoops);
 }
 
-OMPFuseDirective *
-OMPFuseDirective::Create(const ASTContext &C, SourceLocation StartLoc,
-                         SourceLocation EndLoc, ArrayRef<OMPClause *> Clauses,
-                         unsigned NumLoops, unsigned NumGeneratedTopLevelLoops,
-                         Stmt *AssociatedStmt, Stmt *TransformedStmt,
-                         Stmt *PreInits) {
+OMPFuseDirective *OMPFuseDirective::Create(
+    const ASTContext &C, SourceLocation StartLoc, SourceLocation EndLoc,
+    ArrayRef<OMPClause *> Clauses, unsigned NumGeneratedTopLevelLoops,
+    Stmt *AssociatedStmt, Stmt *TransformedStmt, Stmt *PreInits) {
 
   OMPFuseDirective *Dir = createDirective<OMPFuseDirective>(
-      C, Clauses, AssociatedStmt, TransformedStmtOffset + 1, StartLoc, EndLoc,
-      NumLoops);
+      C, Clauses, AssociatedStmt, TransformedStmtOffset + 1, StartLoc, EndLoc);
   Dir->setTransformedStmt(TransformedStmt);
   Dir->setPreInits(PreInits);
   Dir->setNumGeneratedTopLevelLoops(NumGeneratedTopLevelLoops);
   return Dir;
 }
 
 OMPFuseDirective *OMPFuseDirective::CreateEmpty(const ASTContext &C,
-                                                unsigned NumClauses,
-                                                unsigned NumLoops) {
+                                                unsigned NumClauses) {
   OMPFuseDirective *Dir = createEmptyDirective<OMPFuseDirective>(
       C, NumClauses, /*HasAssociatedStmt=*/true, TransformedStmtOffset + 1,
-      SourceLocation(), SourceLocation(), NumLoops);
+      SourceLocation(), SourceLocation());
   return Dir;
 }
 

clang/lib/Sema/SemaOpenMP.cpp

@@ -16005,11 +16005,9 @@ StmtResult SemaOpenMP::ActOnOpenMPFuseDirective(ArrayRef<OMPClause *> Clauses,
   // The NumLoopNests argument is set to a placeholder 1 (even though
   // using looprange fuse could yield up to 3 top level loop nests)
   // because a dependent context could prevent determining its true value
-  if (CurrContext->isDependentContext()) {
+  if (CurrContext->isDependentContext())
     return OMPFuseDirective::Create(Context, StartLoc, EndLoc, Clauses,
-                                    /* NumLoops */ 1, /* LoopSeqSize */ 1,
-                                    AStmt, nullptr, nullptr);
-  }
+                                    /* NumLoops */ 1, AStmt, nullptr, nullptr);
 
   // Validate that the potential loop sequence is transformable for fusion
   // Also collect the HelperExprs, Loop Stmts, Inits, and Number of loops
@@ -16464,7 +16462,6 @@ StmtResult SemaOpenMP::ActOnOpenMPFuseDirective(ArrayRef<OMPClause *> Clauses,
                                       SourceLocation(), SourceLocation());
   }
   return OMPFuseDirective::Create(Context, StartLoc, EndLoc, Clauses,
-                                  SeqAnalysis.LoopSeqSize,
                                   NumGeneratedTopLevelLoops, AStmt, FusionStmt,
                                   buildPreInits(Context, PreInits));
 }

clang/lib/Serialization/ASTReaderStmt.cpp

@@ -2472,8 +2472,6 @@ void ASTStmtReader::VisitOMPReverseDirective(OMPReverseDirective *D) {
 void ASTStmtReader::VisitOMPCanonicalLoopSequenceTransformationDirective(
     OMPCanonicalLoopSequenceTransformationDirective *D) {
   VisitStmt(D);
-  // Field NumLoopsInSequence was read in ReadStmtFromStream.
-  Record.skipInts(1);
   VisitOMPExecutableDirective(D);
   D->setNumGeneratedTopLevelLoops(Record.readUInt32());
 }
@@ -3627,11 +3625,10 @@ Stmt *ASTReader::ReadStmtFromStream(ModuleFile &F) {
       S = OMPReverseDirective::CreateEmpty(Context, NumLoops);
       break;
     }
+
     case STMT_OMP_FUSE_DIRECTIVE: {
-      unsigned NumLoopsInSequence = Record[ASTStmtReader::NumStmtFields];
-      unsigned NumClauses = Record[ASTStmtReader::NumStmtFields + 1];
-      S = OMPFuseDirective::CreateEmpty(Context, NumClauses,
-                                        NumLoopsInSequence);
+      unsigned NumClauses = Record[ASTStmtReader::NumStmtFields];
+      S = OMPFuseDirective::CreateEmpty(Context, NumClauses);
       break;
     }
 

clang/lib/Serialization/ASTWriterStmt.cpp

@@ -2490,7 +2490,6 @@ void ASTStmtWriter::VisitOMPInterchangeDirective(OMPInterchangeDirective *D) {
 void ASTStmtWriter::VisitOMPCanonicalLoopSequenceTransformationDirective(
     OMPCanonicalLoopSequenceTransformationDirective *D) {
   VisitStmt(D);
-  Record.writeUInt32(D->getNumLoopsInSequence());
   VisitOMPExecutableDirective(D);
   Record.writeUInt32(D->getNumGeneratedTopLevelLoops());
 }