Skip to content

[NFC][Clang][OpenMP] Change MEH member of AttachPtrExprComparator from pointer to reference. #161785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 6, 2025
Merged

[NFC][Clang][OpenMP] Change MEH member of AttachPtrExprComparator from pointer to reference. #161785

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 18 additions & 13 deletions clang/lib/CodeGen/CGOpenMPRuntime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6804,28 +6804,29 @@ class MappableExprsHandler {
/// they were computed by collectAttachPtrExprInfo(), if they are semantically
/// different.
struct AttachPtrExprComparator {
const MappableExprsHandler *Handler = nullptr;
const MappableExprsHandler &Handler;
// Cache of previous equality comparison results.
mutable llvm::DenseMap<std::pair<const Expr *, const Expr *>, bool>
CachedEqualityComparisons;

AttachPtrExprComparator(const MappableExprsHandler *H) : Handler(H) {}
AttachPtrExprComparator(const MappableExprsHandler &H) : Handler(H) {}
AttachPtrExprComparator() = delete;

// Return true iff LHS is "less than" RHS.
bool operator()(const Expr *LHS, const Expr *RHS) const {
if (LHS == RHS)
return false;

// First, compare by complexity (depth)
const auto ItLHS = Handler->AttachPtrComponentDepthMap.find(LHS);
const auto ItRHS = Handler->AttachPtrComponentDepthMap.find(RHS);
const auto ItLHS = Handler.AttachPtrComponentDepthMap.find(LHS);
const auto ItRHS = Handler.AttachPtrComponentDepthMap.find(RHS);

std::optional<size_t> DepthLHS =
(ItLHS != Handler->AttachPtrComponentDepthMap.end()) ? ItLHS->second
: std::nullopt;
(ItLHS != Handler.AttachPtrComponentDepthMap.end()) ? ItLHS->second
: std::nullopt;
std::optional<size_t> DepthRHS =
(ItRHS != Handler->AttachPtrComponentDepthMap.end()) ? ItRHS->second
: std::nullopt;
(ItRHS != Handler.AttachPtrComponentDepthMap.end()) ? ItRHS->second
: std::nullopt;

// std::nullopt (no attach pointer) has lowest complexity
if (!DepthLHS.has_value() && !DepthRHS.has_value()) {
Expand Down Expand Up @@ -6873,8 +6874,8 @@ class MappableExprsHandler {
/// Returns true iff LHS was computed before RHS by
/// collectAttachPtrExprInfo().
bool wasComputedBefore(const Expr *LHS, const Expr *RHS) const {
const size_t &OrderLHS = Handler->AttachPtrComputationOrderMap.at(LHS);
const size_t &OrderRHS = Handler->AttachPtrComputationOrderMap.at(RHS);
const size_t &OrderLHS = Handler.AttachPtrComputationOrderMap.at(LHS);
const size_t &OrderRHS = Handler.AttachPtrComputationOrderMap.at(RHS);

return OrderLHS < OrderRHS;
}
Expand All @@ -6893,7 +6894,7 @@ class MappableExprsHandler {
if (!LHS || !RHS)
return false;

ASTContext &Ctx = Handler->CGF.getContext();
ASTContext &Ctx = Handler.CGF.getContext();
// Strip away parentheses and no-op casts to get to the core expression
LHS = LHS->IgnoreParenNoopCasts(Ctx);
RHS = RHS->IgnoreParenNoopCasts(Ctx);
Expand Down Expand Up @@ -7242,6 +7243,10 @@ class MappableExprsHandler {
llvm::DenseMap<const Expr *, size_t> AttachPtrComputationOrderMap = {
{nullptr, 0}};

/// An instance of attach-ptr-expr comparator that can be used throughout the
/// lifetime of this handler.
AttachPtrExprComparator AttachPtrComparator;

llvm::Value *getExprTypeSize(const Expr *E) const {
QualType ExprTy = E->getType().getCanonicalType();

Expand Down Expand Up @@ -8959,7 +8964,7 @@ class MappableExprsHandler {

public:
MappableExprsHandler(const OMPExecutableDirective &Dir, CodeGenFunction &CGF)
: CurDir(&Dir), CGF(CGF) {
: CurDir(&Dir), CGF(CGF), AttachPtrComparator(*this) {
// Extract firstprivate clause information.
for (const auto *C : Dir.getClausesOfKind<OMPFirstprivateClause>())
for (const auto *D : C->varlist())
Expand Down Expand Up @@ -9005,7 +9010,7 @@ class MappableExprsHandler {

/// Constructor for the declare mapper directive.
MappableExprsHandler(const OMPDeclareMapperDecl &Dir, CodeGenFunction &CGF)
: CurDir(&Dir), CGF(CGF) {}
: CurDir(&Dir), CGF(CGF), AttachPtrComparator(*this) {}

/// Generate code for the combined entry if we have a partially mapped struct
/// and take care of the mapping flags of the arguments corresponding to
Expand Down