[Clang] Check that we have the correct RecordDecl

[bwendling]

Ensure we have the correct RecordDecl before returning the Expr we're looking for.

[llvmbot]

@llvm/pr-subscribers-clang-codegen

Author: Bill Wendling (bwendling)

Changes

Ensure we have the correct RecordDecl before returning the Expr we're looking for.

---

Full diff: https://github.com/llvm/llvm-project/pull/111448.diff

1 Files Affected:

• (modified) clang/lib/CodeGen/CGExpr.cpp (+1-1)

diff --git a/clang/lib/CodeGen/CGExpr.cpp b/clang/lib/CodeGen/CGExpr.cpp
index 52d2f6d52abf94..451442765620f7 100644
--- a/clang/lib/CodeGen/CGExpr.cpp
+++ b/clang/lib/CodeGen/CGExpr.cpp
@@ -1096,7 +1096,7 @@ class StructAccessBase
   }
   const Expr *VisitCastExpr(const CastExpr *E) {
     if (E->getCastKind() == CK_LValueToRValue)
-      return E;
+      return IsExpectedRecordDecl(E) ? E : nullptr;
     return Visit(E->getSubExpr());
   }
   const Expr *VisitParenExpr(const ParenExpr *E) {

[llvmbot]

@llvm/pr-subscribers-clang

Author: Bill Wendling (bwendling)

Changes

Ensure we have the correct RecordDecl before returning the Expr we're looking for.

---

Full diff: https://github.com/llvm/llvm-project/pull/111448.diff

1 Files Affected:

• (modified) clang/lib/CodeGen/CGExpr.cpp (+1-1)

diff --git a/clang/lib/CodeGen/CGExpr.cpp b/clang/lib/CodeGen/CGExpr.cpp
index 52d2f6d52abf94..451442765620f7 100644
--- a/clang/lib/CodeGen/CGExpr.cpp
+++ b/clang/lib/CodeGen/CGExpr.cpp
@@ -1096,7 +1096,7 @@ class StructAccessBase
   }
   const Expr *VisitCastExpr(const CastExpr *E) {
     if (E->getCastKind() == CK_LValueToRValue)
-      return E;
+      return IsExpectedRecordDecl(E) ? E : nullptr;
     return Visit(E->getSubExpr());
   }
   const Expr *VisitParenExpr(const ParenExpr *E) {

[efriedma-quic]

LGTM

(I can't come up with a case where it actually fails off the top of my head, but for the sake of consistency, it probably makes sense.)