Cilk For-Range Loop

.github/workflows/docs.yml

@@ -98,7 +98,7 @@ jobs:
         with:
           fetch-depth: 1
       - name: Setup Python env
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.11'
           cache: 'pip'

.github/workflows/llvm-project-tests.yml

@@ -14,7 +14,7 @@ on:
         required: false
       os_list:
         required: false
-        default: '["ubuntu-latest", "windows-2019", "macOS-13"]'
+        default: '["ubuntu-22.04", "windows-2019", "macOS-13"]'
       python_version:
         required: false
         type: string
@@ -39,7 +39,7 @@ on:
         type: string
         # Use windows-2019 due to:
         # https://developercommunity.visualstudio.com/t/Prev-Issue---with-__assume-isnan-/1597317
-        default: '["ubuntu-latest", "macOS-13"]'
+        default: '["ubuntu-22.04", "macOS-13"]'
 
       python_version:
         required: false
@@ -77,7 +77,7 @@ jobs:
       # lldb.  Using this setup-python action to make 3.10 the default
       # python fixes this.
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ inputs.python_version }}
       - name: Install Ninja

.github/workflows/pr-code-format.yml

@@ -56,7 +56,7 @@ jobs:
           clangformat: 17.0.1
 
       - name: Setup Python env
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.11'
           cache: 'pip'

.github/workflows/release-documentation.yml

@@ -37,7 +37,7 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - name: Setup Python env
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           cache: 'pip'
           cache-dependency-path: './llvm/docs/requirements.txt'

.github/workflows/release-doxygen.yml

@@ -39,7 +39,7 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - name: Setup Python env
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           cache: 'pip'
           cache-dependency-path: './llvm/docs/requirements.txt'

clang/include/clang-c/Index.h

@@ -2160,7 +2160,11 @@ enum CXCursorKind {
    */
   CXCursor_CilkScopeStmt = 311,
 
-  CXCursor_LastStmt = CXCursor_CilkScopeStmt,
+  /** A _Cilk_for range statement.
+   */
+  CXCursor_CilkForRangeStmt = 312,
+
+  CXCursor_LastStmt = CXCursor_CilkForRangeStmt,
 
   /**
    * Cursor that represents the translation unit itself.

clang/include/clang/AST/ASTContext.h

@@ -1332,9 +1332,9 @@ class ASTContext : public RefCountedBase<ASTContext> {
     return CanQualType::CreateUnsafe(getComplexType((QualType) T));
   }
 
-  QualType getHyperobjectType(QualType T, Expr *R, Expr *I) const;
-  CanQualType getHyperobjectType(CanQualType T, Expr *R, Expr *I) const {
-    return CanQualType::CreateUnsafe(getHyperobjectType((QualType) T, R, I));
+  QualType getHyperobjectType(QualType T, Expr *I, Expr *R) const;
+  CanQualType getHyperobjectType(CanQualType T, Expr *I, Expr *R) const {
+    return CanQualType::CreateUnsafe(getHyperobjectType((QualType) T, I, R));
   }
 
   /// Return the uniqued reference to the type for a pointer to

clang/include/clang/AST/RecursiveASTVisitor.h

@@ -2880,6 +2880,7 @@ DEF_TRAVERSE_STMT(CilkForStmt, {
   }
 })
 DEF_TRAVERSE_STMT(CilkScopeStmt, {})
+DEF_TRAVERSE_STMT(CilkForRangeStmt, {})
 
 // These operators (all of them) do not need any action except
 // iterating over the children.

clang/include/clang/AST/StmtCilk.h

@@ -14,6 +14,7 @@
 #define LLVM_CLANG_AST_STMTCILK_H
 
 #include "clang/AST/Stmt.h"
+#include "clang/AST/StmtCXX.h"
 #include "clang/Basic/SourceLocation.h"
 
 namespace clang {
@@ -92,6 +93,81 @@ class CilkSyncStmt : public Stmt {
   }
 };
 
+/// CilkForRangeStmt - This represents a '_Cilk_for(range-declarator :
+/// range-expression)' or a '_Cilk_for (init-statement range-declarator :
+/// range-expression)', based on a CXXForRangeStmt which is a C++0x
+/// [stmt.ranged]'s ranged for stmt
+///
+/// This is stored as a FORRANGE stmt embedded inside a CILKFORRANGE with some
+/// other necessary semantic components.
+class CilkForRangeStmt : public Stmt {
+  enum {
+    FORRANGE,
+    LOOPINDEX,
+    LOOPINDEXSTMT,
+    LOCALLOOPINDEX,
+    LIMIT,
+    COND,
+    INC,
+    END
+  };
+  Stmt *SubExprs[END];
+
+public:
+  CilkForRangeStmt(const ASTContext &C, CXXForRangeStmt *ForRange,
+                   VarDecl *LoopIndex, DeclStmt *LocalLoopIndex,
+                   DeclStmt *Limit, Expr *Cond, Expr *Inc,
+                   DeclStmt *LoopIndexStmt);
+
+  /// \brief Build an empty cilk for range statement.
+  explicit CilkForRangeStmt(EmptyShell Empty)
+      : Stmt(CilkForRangeStmtClass, Empty) {}
+
+  static bool classof(const Stmt *T) {
+    return T->getStmtClass() == CilkForRangeStmtClass;
+  }
+
+  CXXForRangeStmt *getCXXForRangeStmt() const;
+
+  void setForRange(Stmt *S) { SubExprs[FORRANGE] = S; }
+
+  VarDecl *getLoopIndex() const;
+  void setLoopIndex(const ASTContext &C, VarDecl *V);
+
+  VarDecl *getLocalLoopIndex();
+  const VarDecl *getLocalLoopIndex() const;
+
+  Expr *getCond() { return reinterpret_cast<Expr *>(SubExprs[COND]); }
+  Expr *getInc() { return reinterpret_cast<Expr *>(SubExprs[INC]); }
+  DeclStmt *getLoopIndexStmt() {
+    return cast_or_null<DeclStmt>(SubExprs[LOOPINDEXSTMT]);
+  }
+  DeclStmt *getLimitStmt() { return cast_or_null<DeclStmt>(SubExprs[LIMIT]); }
+  DeclStmt *getLocalLoopIndexStmt() {
+    return cast<DeclStmt>(SubExprs[LOCALLOOPINDEX]);
+  }
+
+  const Expr *getCond() const {
+    return reinterpret_cast<Expr *>(SubExprs[COND]);
+  }
+  const Expr *getInc() const { return reinterpret_cast<Expr *>(SubExprs[INC]); }
+  const DeclStmt *getLoopIndexStmt() const {
+    return cast_or_null<DeclStmt>(SubExprs[LOOPINDEXSTMT]);
+  }
+  const DeclStmt *getLimitStmt() const {
+    return cast_or_null<DeclStmt>(SubExprs[LIMIT]);
+  }
+  const DeclStmt *getLocalLoopIndexStmt() const {
+    return cast<DeclStmt>(SubExprs[LOCALLOOPINDEX]);
+  }
+
+  SourceLocation getBeginLoc() const LLVM_READONLY;
+  SourceLocation getEndLoc() const LLVM_READONLY;
+
+  // Iterators
+  child_range children() { return child_range(&SubExprs[0], &SubExprs[END]); }
+};
+
 /// CilkForStmt - This represents a '_Cilk_for(init;cond;inc)' stmt.
 class CilkForStmt : public Stmt {
   SourceLocation CilkForLoc;

clang/include/clang/AST/TypeProperties.td

@@ -21,15 +21,15 @@ let Class = HyperobjectType in {
   def : Property<"elementType", QualType> {
     let Read = [{ node->getElementType() }];
   }
-  def : Property<"reduce", ExprRef> {
-    let Read = [{ node->getReduce() }];
-  }
   def : Property<"identity", ExprRef> {
     let Read = [{ node->getIdentity() }];
   }
+  def : Property<"reduce", ExprRef> {
+    let Read = [{ node->getReduce() }];
+  }
 
   def : Creator<[{
-    return ctx.getHyperobjectType(elementType, reduce, identity);
+    return ctx.getHyperobjectType(elementType, identity, reduce);
   }]>;
 }
 

clang/include/clang/Basic/Attr.td

@@ -4501,12 +4501,6 @@ def HyperView : InheritableAttr {
   let Documentation = [StrandMallocDocs];
 }
 
-def HyperToken : InheritableAttr {
-  let Spellings = [Clang<"hyper_token">];
-  let Subjects = SubjectList<[FunctionLike]>;
-  let Documentation = [StrandMallocDocs];
-}
-
 def ReducerRegister : InheritableAttr {
   let Spellings = [Clang<"reducer_register">];
   let Subjects = SubjectList<[FunctionLike]>;

clang/include/clang/Basic/DiagnosticParseKinds.td

@@ -1387,8 +1387,6 @@ def err_cilk_for_missing_increment: Error<
   "missing loop increment expression in 'cilk_for'">;
 def err_cilk_for_missing_semi: Error<
   "expected ';' in 'cilk_for'">;
-def err_cilk_for_forrange_loop_not_supported: Error<
-  "'cilk_for' not supported on for-range loops">;
 def err_cilk_for_foreach_loop_not_supported: Error<
   "'cilk_for' not supported on for-each loops">;
 def err_pragma_cilk_invalid_option : Error<
@@ -1401,6 +1399,9 @@ def warn_cilk_for_following_grainsize: Warning<
 def warn_pragma_cilk_grainsize_equals: Warning<
   "'#pragma cilk grainsize' no longer requires '='">,
   InGroup<SourceUsesCilkPlus>;
+def warn_cilk_for_forrange_loop_experimental: Warning<
+  "'cilk_for' support for for-range loops is currently EXPERIMENTAL only!">,
+  InGroup<SourceUsesCilkPlus>;
 def error_hyperobject_arguments: Error<
   "hyperobject must have 0 or 2 callbacks">;
 

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -5896,7 +5896,7 @@ def note_deleted_special_member_class_subobject : Note<
 def note_deleted_default_ctor_uninit_field : Note<
   "%select{default constructor of|constructor inherited by}0 "
   "%1 is implicitly deleted because field %2 of "
-  "%select{reference|const-qualified}4 type %3 would not be initialized">;
+  "%select{reference|const-qualified|reducer}4 type %3 would not be initialized">;
 def note_deleted_default_ctor_all_const : Note<
   "%select{default constructor of|constructor inherited by}0 "
   "%1 is implicitly deleted because all "
@@ -10892,11 +10892,14 @@ def confusing_hyperobject : Error<
 def incomplete_hyperobject : Error<
    "incomplete type %0 may not be a hyperobject">;
 
+def qualified_hyperobject : Error<
+   "qualified type %0 may not be a hyperobject">;
+
 def nested_hyperobject : Error<
    "type %0, which contains a hyperobject, may not be a hyperobject">;
 
-def reducer_callbacks_not_allowed: Warning<
-   "reducer callbacks not implemented for structure members">,
+def reducer_registration_not_implemented: Warning<
+   "reducer registration not implemented for structure members">,
     InGroup<CilkIgnored>;
 
 def err_invalid_reducer_callback : Error<
@@ -10916,7 +10919,12 @@ def err_hyperobject_struct_assign : Error<
 def no_reducer_array : Warning<
     "array of reducer not implemented">,
     InGroup<CilkIgnored>;
-} // end of Cilk category
+
+// cilk for_range
+def err_cilk_for_range_end_minus_begin : Error<
+  "Cannot determine length with '__end - __begin'. Please use a random access iterator.">;
+} 
+// end of Cilk category
 
 let CategoryName = "OpenMP Issue" in {
 // OpenMP support.

clang/include/clang/Basic/StmtNodes.td

@@ -223,6 +223,7 @@ def CilkSpawnStmt : StmtNode<Stmt>;
 def CilkSpawnExpr : StmtNode<Expr>;
 def CilkForStmt : StmtNode<Stmt>;
 def CilkScopeStmt : StmtNode<Stmt>;
+def CilkForRangeStmt: StmtNode<Stmt>;
 
 // OpenMP Directives.
 def OMPCanonicalLoop : StmtNode<Stmt>;

clang/include/clang/Sema/Sema.h

@@ -5332,7 +5332,13 @@ class Sema final {
                               SourceLocation RParenLoc, Stmt *Body,
                               DeclStmt *LoopVar = nullptr,
                               Expr *OgCond = nullptr, Expr *OgInc = nullptr);
-
+  StmtResult ActOnCilkForRangeStmt(Scope *S, SourceLocation ForLoc,
+                                   Stmt *InitStmt, Stmt *First,
+                                   SourceLocation ColonLoc, Expr *Range,
+                                   SourceLocation RParenLoc,
+                                   BuildForRangeKind Kind);
+  StmtResult BuildCilkForRangeStmt(CXXForRangeStmt *S);
+  StmtResult FinishCilkForRangeStmt(Stmt *S, Stmt *B);
   StmtResult BuildCilkForStmt(SourceLocation CilkForLoc,
                               SourceLocation LParenLoc,
                               Stmt *Init, Expr *Cond, Expr *Inc,

clang/include/clang/Serialization/ASTBitCodes.h

@@ -2021,6 +2021,7 @@ enum StmtCode {
   STMT_CILKSYNC,
   STMT_CILKFOR,
   STMT_CILKSCOPE,
+  STMT_CILKFORRANGE,
 };
 
 /// The kinds of designators that can occur in a

clang/lib/AST/ASTImporter.cpp

@@ -1161,7 +1161,7 @@ ExpectedType ASTNodeImporter::VisitHyperobjectType(const HyperobjectType *T) {
     return ToReduceOrErr.takeError();
 
   return Importer.getToContext().getHyperobjectType(
-      *ToElementTypeOrErr, *ToReduceOrErr, *ToIdentityOrErr);
+      *ToElementTypeOrErr, *ToIdentityOrErr, *ToReduceOrErr);
 }
 
 ExpectedType ASTNodeImporter::VisitComplexType(const ComplexType *T) {

clang/lib/AST/ASTStructuralEquivalence.cpp

@@ -844,7 +844,7 @@ static bool IsStructurallyEquivalent(StructuralEquivalenceContext &Context,
     const HyperobjectType *H2 = cast<HyperobjectType>(T2);
     Expr *R1 = H1->getReduce(), *R2 = H2->getReduce();
     Expr *I1 = H1->getIdentity(), *I2 = H2->getIdentity();
-    if (!!I2 != !!I2 || !!R1 != !!R2)
+    if (!!I1 != !!I2 || !!R1 != !!R2)
       return false;
     if (I1 && !IsStructurallyEquivalent(Context, I1, I2))
       return false;

clang/lib/AST/DeclCXX.cpp

@@ -1083,6 +1083,15 @@ void CXXRecordDecl::addedMember(Decl *D) {
         data().DefaultedCopyConstructorIsDeleted = true;
     }
 
+    if (T->isHyperobjectType()) {
+      // Do not allow braced list initialization, which would
+      // suppress hyperobject registration.
+      data().Aggregate = false;
+      data().HasIrrelevantDestructor = false;
+      data().HasTrivialSpecialMembers &= ~SMF_All;
+      data().HasTrivialSpecialMembersForCall &= ~SMF_All;
+    }
+
     if (!Field->hasInClassInitializer() && !Field->isMutable()) {
       if (CXXRecordDecl *FieldType = T->getAsCXXRecordDecl()) {
         if (FieldType->hasDefinition() && !FieldType->allowConstDefaultInit())