[Clang][counted-by] Bail out of visitor for LValueToRValue cast #125571
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
An LValueToRValue cast shouldn't be ignored, so bail out of the visitor if we encounter one.
llvmbot
added
clang
Member
|
@llvm/pr-subscribers-clang Author: Bill Wendling (bwendling) ChangesAn LValueToRValue cast shouldn't be ignored, so bail out of the visitor if we encounter one. Full diff: https://github.com/llvm/llvm-project/pull/125571.diff 1 Files Affected:
diff --git a/clang/lib/CodeGen/CGBuiltin.cpp b/clang/lib/CodeGen/CGBuiltin.cpp
index 11fa295dad9524..339bcd14c5bc8c 100644
--- a/clang/lib/CodeGen/CGBuiltin.cpp
+++ b/clang/lib/CodeGen/CGBuiltin.cpp
@@ -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;
@@ -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());
}
@@ -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;
|
Member
|
@llvm/pr-subscribers-clang-codegen Author: Bill Wendling (bwendling) ChangesAn LValueToRValue cast shouldn't be ignored, so bail out of the visitor if we encounter one. Full diff: https://github.com/llvm/llvm-project/pull/125571.diff 1 Files Affected:
diff --git a/clang/lib/CodeGen/CGBuiltin.cpp b/clang/lib/CodeGen/CGBuiltin.cpp
index 11fa295dad9524..339bcd14c5bc8c 100644
--- a/clang/lib/CodeGen/CGBuiltin.cpp
+++ b/clang/lib/CodeGen/CGBuiltin.cpp
@@ -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;
@@ -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());
}
@@ -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;
|
Collaborator
Author
|
This change didn't affect the tests, which is either good or bad, depending on your point of view. I assume that it's okay because we're looking for a |
Collaborator
|
My expectation was that this would affect the tests from #125298, because the MemberExpr there is a child of an LValueToRValue conversion. I could be missing something, though? |
Collaborator
Author
|
Those tests are meant to bail out if the MemberExpr is a pointer. That patch may be superseded by this patch? |
Icohedron
pushed a commit
to Icohedron/llvm-project
that referenced
this pull request
Feb 11, 2025
…#125571) An LValueToRValue cast shouldn't be ignored, so bail out of the visitor if we encounter one.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
An LValueToRValue cast shouldn't be ignored, so bail out of the visitor if we encounter one.