Index: include/clang/AST/Expr.h =================================================================== --- include/clang/AST/Expr.h +++ include/clang/AST/Expr.h @@ -5052,6 +5052,82 @@ return getNumAssocs(); } + template class AssociationIteratorTy; + /// Bundle together an association expression and its TypeSourceInfo. + /// The Const template parameter is for the const and non-const versions + /// of AssociationTy. + template class AssociationTy { + friend class GenericSelectionExpr; + template friend class AssociationIteratorTy; + using ExprPtrTy = + typename std::conditional::type; + using TSIPtrTy = typename std::conditional::type; + ExprPtrTy E; + TSIPtrTy TSI; + bool Selected; + AssociationTy(ExprPtrTy E, TSIPtrTy TSI, bool Selected) + : E(E), TSI(TSI), Selected(Selected) {} + + public: + ExprPtrTy getAssociationExpr() const { return E; } + TSIPtrTy getTypeSourceInfo() const { return TSI; } + QualType getType() const { return TSI ? TSI->getType() : QualType(); } + bool isSelected() const { return Selected; } + AssociationTy *operator->() { return this; } + const AssociationTy *operator->() const { return this; } + }; // class AssociationTy + + /// Iterator over const and non-const associations. Note that this is + /// only a forward iterator, not because of any fundamental limitations, + /// but because it is good enough to be usable in ranges. + template class AssociationIteratorTy { + friend class GenericSelectionExpr; + using StmtPtrPtrTy = + typename std::conditional::type; + using TSIPtrPtrTy = + typename std::conditional::type; + StmtPtrPtrTy E = nullptr; + TSIPtrPtrTy TSI = nullptr; // Kept in sync with E. + unsigned Offset = 0, SelectedOffset = 0; + AssociationIteratorTy(StmtPtrPtrTy E, TSIPtrPtrTy TSI, unsigned Offset, + unsigned SelectedOffset) + : E(E), TSI(TSI), Offset(Offset), SelectedOffset(SelectedOffset) {} + + public: + using iterator_category = std::forward_iterator_tag; + using value_type = AssociationTy; + using difference_type = std::ptrdiff_t; + using reference = AssociationTy; + using pointer = AssociationTy; + AssociationIteratorTy() = default; + reference operator*() const { + return AssociationTy(cast(*E), *TSI, + Offset == SelectedOffset); + } + pointer operator->() const { return **this; } + AssociationIteratorTy &operator++() { + ++E; + ++TSI; + ++Offset; + return *this; + } + AssociationIteratorTy operator++(int) { + AssociationIteratorTy Tmp = *this; + ++*this; + return Tmp; + } + friend bool operator==(AssociationIteratorTy It1, + AssociationIteratorTy It2) { + return It1.E == It2.E; + } + friend bool operator!=(AssociationIteratorTy It1, + AssociationIteratorTy It2) { + return !(It1 == It2); + } + }; // class AssociationIterator + /// Build a non-result-dependent generic selection expression. GenericSelectionExpr(const ASTContext &Context, SourceLocation GenericLoc, Expr *ControllingExpr, @@ -5092,6 +5168,14 @@ static GenericSelectionExpr *CreateEmpty(const ASTContext &Context, unsigned NumAssocs); + using Association = AssociationTy; + using ConstAssociation = AssociationTy; + using AssociationIterator = AssociationIteratorTy; + using ConstAssociationIterator = AssociationIteratorTy; + using association_range = llvm::iterator_range; + using const_association_range = + llvm::iterator_range; + /// The number of association expressions. unsigned getNumAssocs() const { return NumAssocs; } @@ -5135,22 +5219,42 @@ return {getTrailingObjects(), NumAssocs}; } - Expr *getAssocExpr(unsigned I) { - return cast(getTrailingObjects()[ASSOC_EXPR_START + I]); - } - const Expr *getAssocExpr(unsigned I) const { - return cast(getTrailingObjects()[ASSOC_EXPR_START + I]); - } - - TypeSourceInfo *getAssocTypeSourceInfo(unsigned I) { - return getTrailingObjects()[I]; - } - const TypeSourceInfo *getAssocTypeSourceInfo(unsigned I) const { - return getTrailingObjects()[I]; - } - QualType getAssocType(unsigned I) const { - const TypeSourceInfo *TSI = getAssocTypeSourceInfo(I); - return TSI ? TSI->getType() : QualType(); + /// Return the Ith association expression with its TypeSourceInfo, + /// bundled together in GenericSelectionExpr::(Const)Association. + Association getAssociation(unsigned I) { + assert(I < getNumAssocs() && + "Out-of-range index in GenericSelectionExpr::getAssociation!"); + return Association( + cast(getTrailingObjects()[ASSOC_EXPR_START + I]), + getTrailingObjects()[I], + !isResultDependent() && (getResultIndex() == I)); + } + ConstAssociation getAssociation(unsigned I) const { + assert(I < getNumAssocs() && + "Out-of-range index in GenericSelectionExpr::getAssociation!"); + return ConstAssociation( + cast(getTrailingObjects()[ASSOC_EXPR_START + I]), + getTrailingObjects()[I], + !isResultDependent() && (getResultIndex() == I)); + } + + association_range associations() { + AssociationIterator Begin(getTrailingObjects() + ASSOC_EXPR_START, + getTrailingObjects(), + /*Offset=*/0, ResultIndex); + AssociationIterator End(Begin.E + NumAssocs, Begin.TSI + NumAssocs, + /*Offset=*/NumAssocs, ResultIndex); + return {Begin, End}; + } + + const_association_range associations() const { + ConstAssociationIterator Begin(getTrailingObjects() + + ASSOC_EXPR_START, + getTrailingObjects(), + /*Offset=*/0, ResultIndex); + ConstAssociationIterator End(Begin.E + NumAssocs, Begin.TSI + NumAssocs, + /*Offset=*/NumAssocs, ResultIndex); + return {Begin, End}; } SourceLocation getGenericLoc() const { Index: include/clang/AST/RecursiveASTVisitor.h =================================================================== --- include/clang/AST/RecursiveASTVisitor.h +++ include/clang/AST/RecursiveASTVisitor.h @@ -2300,10 +2300,10 @@ // generic associations). DEF_TRAVERSE_STMT(GenericSelectionExpr, { TRY_TO(TraverseStmt(S->getControllingExpr())); - for (unsigned i = 0; i != S->getNumAssocs(); ++i) { - if (TypeSourceInfo *TS = S->getAssocTypeSourceInfo(i)) - TRY_TO(TraverseTypeLoc(TS->getTypeLoc())); - TRY_TO_TRAVERSE_OR_ENQUEUE_STMT(S->getAssocExpr(i)); + for (GenericSelectionExpr::Association Assoc : S->associations()) { + if (TypeSourceInfo *TSI = Assoc.getTypeSourceInfo()) + TRY_TO(TraverseTypeLoc(TSI->getTypeLoc())); + TRY_TO_TRAVERSE_OR_ENQUEUE_STMT(Assoc.getAssociationExpr()); } ShouldVisitChildren = false; }) Index: include/clang/AST/StmtDataCollectors.td =================================================================== --- include/clang/AST/StmtDataCollectors.td +++ include/clang/AST/StmtDataCollectors.td @@ -189,8 +189,8 @@ } class GenericSelectionExpr { code Code = [{ - for (unsigned i = 0; i < S->getNumAssocs(); ++i) { - addData(S->getAssocType(i)); + for (GenericSelectionExpr::ConstAssociation Assoc : S->associations()) { + addData(Assoc.getType()); } }]; } Index: lib/AST/ASTDumper.cpp =================================================================== --- lib/AST/ASTDumper.cpp +++ lib/AST/ASTDumper.cpp @@ -1462,21 +1462,21 @@ dumpStmt(E->getControllingExpr()); dumpTypeAsChild(E->getControllingExpr()->getType()); // FIXME: remove - for (unsigned I = 0, N = E->getNumAssocs(); I != N; ++I) { + for (GenericSelectionExpr::ConstAssociation Assoc : E->associations()) { dumpChild([=] { - if (const TypeSourceInfo *TSI = E->getAssocTypeSourceInfo(I)) { + if (const TypeSourceInfo *TSI = Assoc.getTypeSourceInfo()) { OS << "case "; NodeDumper.dumpType(TSI->getType()); } else { OS << "default"; } - if (!E->isResultDependent() && E->getResultIndex() == I) + if (Assoc.isSelected()) OS << " selected"; - if (const TypeSourceInfo *TSI = E->getAssocTypeSourceInfo(I)) + if (const TypeSourceInfo *TSI = Assoc.getTypeSourceInfo()) dumpTypeAsChild(TSI->getType()); - dumpStmt(E->getAssocExpr(I)); + dumpStmt(Assoc.getAssociationExpr()); }); } } Index: lib/AST/StmtPrinter.cpp =================================================================== --- lib/AST/StmtPrinter.cpp +++ lib/AST/StmtPrinter.cpp @@ -1261,15 +1261,15 @@ void StmtPrinter::VisitGenericSelectionExpr(GenericSelectionExpr *Node) { OS << "_Generic("; PrintExpr(Node->getControllingExpr()); - for (unsigned i = 0; i != Node->getNumAssocs(); ++i) { + for (GenericSelectionExpr::Association Assoc : Node->associations()) { OS << ", "; - QualType T = Node->getAssocType(i); + QualType T = Assoc.getType(); if (T.isNull()) OS << "default"; else T.print(OS, Policy); OS << ": "; - PrintExpr(Node->getAssocExpr(i)); + PrintExpr(Assoc.getAssociationExpr()); } OS << ")"; } Index: lib/AST/StmtProfile.cpp =================================================================== --- lib/AST/StmtProfile.cpp +++ lib/AST/StmtProfile.cpp @@ -1259,13 +1259,13 @@ void StmtProfiler::VisitGenericSelectionExpr(const GenericSelectionExpr *S) { VisitExpr(S); - for (unsigned i = 0; i != S->getNumAssocs(); ++i) { - QualType T = S->getAssocType(i); + for (GenericSelectionExpr::ConstAssociation Assoc : S->associations()) { + QualType T = Assoc.getType(); if (T.isNull()) ID.AddPointer(nullptr); else VisitType(T); - VisitExpr(S->getAssocExpr(i)); + VisitExpr(Assoc.getAssociationExpr()); } } Index: lib/Sema/SemaExprObjC.cpp =================================================================== --- lib/Sema/SemaExprObjC.cpp +++ lib/Sema/SemaExprObjC.cpp @@ -4332,14 +4332,16 @@ assert(!gse->isResultDependent()); unsigned n = gse->getNumAssocs(); - SmallVector subExprs(n); - SmallVector subTypes(n); - for (unsigned i = 0; i != n; ++i) { - subTypes[i] = gse->getAssocTypeSourceInfo(i); - Expr *sub = gse->getAssocExpr(i); - if (i == gse->getResultIndex()) + SmallVector subExprs; + SmallVector subTypes; + subExprs.reserve(n); + subTypes.reserve(n); + for (GenericSelectionExpr::Association assoc : gse->associations()) { + subTypes.push_back(assoc.getTypeSourceInfo()); + Expr *sub = assoc.getAssociationExpr(); + if (assoc.isSelected()) sub = stripARCUnbridgedCast(sub); - subExprs[i] = sub; + subExprs.push_back(sub); } return GenericSelectionExpr::Create( Index: lib/Sema/SemaPseudoObject.cpp =================================================================== --- lib/Sema/SemaPseudoObject.cpp +++ lib/Sema/SemaPseudoObject.cpp @@ -140,19 +140,22 @@ unsigned resultIndex = gse->getResultIndex(); unsigned numAssocs = gse->getNumAssocs(); - SmallVector assocs(numAssocs); - SmallVector assocTypes(numAssocs); - - for (unsigned i = 0; i != numAssocs; ++i) { - Expr *assoc = gse->getAssocExpr(i); - if (i == resultIndex) assoc = rebuild(assoc); - assocs[i] = assoc; - assocTypes[i] = gse->getAssocTypeSourceInfo(i); + SmallVector assocExprs; + SmallVector assocTypes; + assocExprs.reserve(numAssocs); + assocTypes.reserve(numAssocs); + + for (GenericSelectionExpr::Association assoc : gse->associations()) { + Expr *assocExpr = assoc.getAssociationExpr(); + if (assoc.isSelected()) + assocExpr = rebuild(assocExpr); + assocExprs.push_back(assocExpr); + assocTypes.push_back(assoc.getTypeSourceInfo()); } return GenericSelectionExpr::Create( S.Context, gse->getGenericLoc(), gse->getControllingExpr(), - assocTypes, assocs, gse->getDefaultLoc(), gse->getRParenLoc(), + assocTypes, assocExprs, gse->getDefaultLoc(), gse->getRParenLoc(), gse->containsUnexpandedParameterPack(), resultIndex); } Index: lib/Sema/TreeTransform.h =================================================================== --- lib/Sema/TreeTransform.h +++ lib/Sema/TreeTransform.h @@ -9071,10 +9071,10 @@ SmallVector AssocExprs; SmallVector AssocTypes; - for (unsigned i = 0; i != E->getNumAssocs(); ++i) { - TypeSourceInfo *TS = E->getAssocTypeSourceInfo(i); - if (TS) { - TypeSourceInfo *AssocType = getDerived().TransformType(TS); + for (GenericSelectionExpr::Association Assoc : E->associations()) { + TypeSourceInfo *TSI = Assoc.getTypeSourceInfo(); + if (TSI) { + TypeSourceInfo *AssocType = getDerived().TransformType(TSI); if (!AssocType) return ExprError(); AssocTypes.push_back(AssocType); @@ -9082,7 +9082,8 @@ AssocTypes.push_back(nullptr); } - ExprResult AssocExpr = getDerived().TransformExpr(E->getAssocExpr(i)); + ExprResult AssocExpr = + getDerived().TransformExpr(Assoc.getAssociationExpr()); if (AssocExpr.isInvalid()) return ExprError(); AssocExprs.push_back(AssocExpr.get());