Skip to content
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

Check whether EvaluatedStmt::Value is valid in VarDecl::hasInit #94515

Merged
merged 2 commits into from
Jun 14, 2024
Merged

Check whether EvaluatedStmt::Value is valid in VarDecl::hasInit #94515

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22a8fa0
Check whether EvaluatedStmt::Value is valid in VarDecl::hasInit
ahatanak Jun 5, 2024
a54e9ac
Move the conditional into the argument
ahatanak Jun 14, 2024
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
10 changes: 6 additions & 4 deletions clang/lib/AST/Decl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2390,6 +2390,9 @@ bool VarDecl::hasInit() const {
if (P->hasUnparsedDefaultArg() || P->hasUninstantiatedDefaultArg())
return false;

if (auto *Eval = getEvaluatedStmt())
return Eval->Value.isValid();

return !Init.isNull();
}

Expand All @@ -2402,10 +2405,9 @@ Expr *VarDecl::getInit() {

auto *Eval = getEvaluatedStmt();

return cast_if_present<Expr>(
Eval->Value.isOffset()
? Eval->Value.get(getASTContext().getExternalSource())
: Eval->Value.get(nullptr));
return cast<Expr>(Eval->Value.isOffset()
? Eval->Value.get(getASTContext().getExternalSource())
: Eval->Value.get(nullptr));
Copy link
Contributor

Choose a reason for hiding this comment

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

Small nit: It seems this could move the conditional into the argument for Eval->Value.get.

}

Stmt **VarDecl::getInitAddress() {
Expand Down
Loading