Skip to content

[Clang][counted-by] Bail out of visitor for LValueToRValue cast #125571

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 2 commits into from
Feb 4, 2025
Merged

[Clang][counted-by] Bail out of visitor for LValueToRValue cast #125571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5086e8
[Clang][counted-by] Bail out of visitor for LValueToRValue cast
bwendling Feb 3, 2025
1da4577
Add testcase from a bug report.
bwendling Feb 4, 2025
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
18 changes: 10 additions & 8 deletions clang/lib/CodeGen/CGBuiltin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1055,20 +1055,20 @@ namespace {
/// StructFieldAccess is a simple visitor class to grab the first MemberExpr
/// from an Expr. It records any ArraySubscriptExpr we meet along the way.
class StructFieldAccess
: public ConstStmtVisitor<StructFieldAccess, const MemberExpr *> {
: public ConstStmtVisitor<StructFieldAccess, const Expr *> {
bool AddrOfSeen = false;

public:
const ArraySubscriptExpr *ASE = nullptr;

const MemberExpr *VisitMemberExpr(const MemberExpr *E) {
const Expr *VisitMemberExpr(const MemberExpr *E) {
if (AddrOfSeen && E->getType()->isArrayType())
// Avoid forms like '&ptr->array'.
return nullptr;
return E;
}

const MemberExpr *VisitArraySubscriptExpr(const ArraySubscriptExpr *E) {
const Expr *VisitArraySubscriptExpr(const ArraySubscriptExpr *E) {
if (ASE)
// We don't support multiple subscripts.
return nullptr;
Expand All @@ -1077,17 +1077,19 @@ class StructFieldAccess
ASE = E;
return Visit(E->getBase());
}
const MemberExpr *VisitCastExpr(const CastExpr *E) {
const Expr *VisitCastExpr(const CastExpr *E) {
if (E->getCastKind() == CK_LValueToRValue)
return E;
return Visit(E->getSubExpr());
}
const MemberExpr *VisitParenExpr(const ParenExpr *E) {
const Expr *VisitParenExpr(const ParenExpr *E) {
return Visit(E->getSubExpr());
}
const MemberExpr *VisitUnaryAddrOf(const clang::UnaryOperator *E) {
const Expr *VisitUnaryAddrOf(const clang::UnaryOperator *E) {
AddrOfSeen = true;
return Visit(E->getSubExpr());
}
const MemberExpr *VisitUnaryDeref(const clang::UnaryOperator *E) {
const Expr *VisitUnaryDeref(const clang::UnaryOperator *E) {
AddrOfSeen = false;
return Visit(E->getSubExpr());
}
Expand Down Expand Up @@ -1188,7 +1190,7 @@ CodeGenFunction::emitCountedByMemberSize(const Expr *E, llvm::Value *EmittedE,
// GCC does for consistency's sake.

StructFieldAccess Visitor;
const MemberExpr *ME = Visitor.Visit(E);
const MemberExpr *ME = dyn_cast_if_present<MemberExpr>(Visitor.Visit(E));
if (!ME)
return nullptr;

Expand Down
Loading