Skip to content

[Clang][AST] Fix crash in APValue::LValueBase::getType when we have invalid decl #75130

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.

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions clang/docs/ReleaseNotes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -641,6 +641,10 @@ Bug Fixes in This Version
Fixes (`#67317 <https://github.com/llvm/llvm-project/issues/67317>`_)
- Clang now properly diagnoses use of stand-alone OpenMP directives after a
label (including ``case`` or ``default`` labels).
- Fix crash when dealing with ill-formed code where we were not handling invalid
redeclarations properly.
Fixes (`#69468 <https://github.com/llvm/llvm-project/issues/69468>`_)


Before:

Expand Down
4 changes: 3 additions & 1 deletion clang/lib/AST/APValue.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,13 @@ QualType APValue::LValueBase::getType() const {
// constexpr int *p = &arr[1]; // valid?
//
// For now, we take the most complete type we can find.
for (auto *Redecl = cast<ValueDecl>(D->getMostRecentDecl()); Redecl;
for (auto *Redecl = cast<ValueDecl>(D->getMostRecentDecl());
Redecl && !Redecl->isInvalidDecl();
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't seem right to me... this change makes us skip the 'right' answer when there is a redecl in the way.

In reality, I wonder if this whole loop is misguided. If we want to just find the 'last' non-incomplete-array-type, that search is pretty easy by looping through 'redecls'. I THINK this ends up better as:

QualType T = D->getMostRecentDecl()->getType();
for (const auto *R : D->redecls()) { // unsure if this needs to be 'getMostRecentDecl?'
  if (!R->isInvalidDecl() && !R->getType()->isIncompleteArrayType())
    T = R->getType();
}
return T;

redecl_iterator is a forward-iterator, else I'd suggest just doing an rbegin/rend type thing on them.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are dealing with ill-formed code here. So there is not "right answer", right? Are you saying that we might misdiagnose an error?

Or are you saying the original code is incorrect and you think there is well-formed code we will not do the correct thing on?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem is that if the 'invalid' decl is the last one, we end up giving up on this loop entirely. If the purpose here is to just skip an invalid decl, we probably need to skip JUST it, not all previous ones too.

Redecl = cast_or_null<ValueDecl>(Redecl->getPreviousDecl())) {
QualType T = Redecl->getType();
if (!T->isIncompleteArrayType())
return T;
D = Redecl;
}
return D->getType();
}
Expand Down
14 changes: 14 additions & 0 deletions clang/test/AST/gh69468.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// RUN: %clang_cc1 -verify %s


a[i] = b[i]; // expected-error {{use of undeclared identifier 'i'}} \
// expected-error {{a type specifier is required for all declarations}} \
// expected-error {{use of undeclared identifier 'b'}} \
// expected-error {{use of undeclared identifier 'i'}}
extern char b[];
extern char a[];

void foo(int j) {
// This used to crash here
a[j] = b[j];
}