Author: Henrich Lauko Date: 2026-10-15T08:22:16+02:00 New Revision: 9abbf8e28c8a7196987615c31671b099832445ad
URL: https://github.com/llvm/llvm-project/commit/9abbf8e28c8a7196987615c31671b099832445ad DIFF: https://github.com/llvm/llvm-project/commit/9abbf8e28c8a7196987615c31671b099832445ad.diff LOG: [CIR][NFC] Use CleanupKindAttr predicates in FlattenCFG (#221234) `flattenCleanup` still checks the cleanup kind by comparing the raw enum against `Normal`, `EH` and `All`. `CleanupKindAttr::isNormal()` and `isEH()` mean exactly that, and the rest of `FlattenCFG` already calls `isEH()` since #224829. Assisted-by: Claude Code (Claude Opus 5.5). Added: Modified: clang/lib/CIR/Dialect/Transforms/FlattenCFG.cpp Removed: ################################################################################ diff --git a/clang/lib/CIR/Dialect/Transforms/FlattenCFG.cpp b/clang/lib/CIR/Dialect/Transforms/FlattenCFG.cpp index 4005124a054ac..2787b57adad6e 100644 --- a/clang/lib/CIR/Dialect/Transforms/FlattenCFG.cpp +++ b/clang/lib/CIR/Dialect/Transforms/FlattenCFG.cpp @@ -1449,11 +1449,9 @@ class CIRCleanupScopeOpFlattening llvm::SmallVectorImpl<cir::ResumeOp> &resumeOpsToChain, mlir::PatternRewriter &rewriter) const { mlir::Location loc = cleanupOp.getLoc(); - cir::CleanupKind cleanupKind = cleanupOp.getCleanupKind(); - bool hasNormalCleanup = cleanupKind == cir::CleanupKind::Normal || - cleanupKind == cir::CleanupKind::All; - bool hasEHCleanup = cleanupKind == cir::CleanupKind::EH || - cleanupKind == cir::CleanupKind::All; + cir::CleanupKindAttr cleanupKind = cleanupOp.getCleanupKindAttr(); + bool hasNormalCleanup = cleanupKind.isNormal(); + bool hasEHCleanup = cleanupKind.isEH(); bool isMultiExit = exits.size() > 1; // If every exit from the body is a musttail return, nothing reaches the _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
