Skip to content

[clang][NFC] Remove const_casts from diagnostic emissions #161211

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 1 commit into from
Sep 29, 2025
Merged

[clang][NFC] Remove const_casts from diagnostic emissions #161211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 additions & 4 deletions clang/lib/Sema/AnalysisBasedWarnings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -983,10 +983,9 @@ static void DiagUninitUse(Sema &S, const VarDecl *VD, const UninitUse &Use,
case UninitUse::AfterDecl:
case UninitUse::AfterCall:
S.Diag(VD->getLocation(), diag::warn_sometimes_uninit_var)
<< VD->getDeclName() << IsCapturedByBlock
<< (Use.getKind() == UninitUse::AfterDecl ? 4 : 5)
<< const_cast<DeclContext*>(VD->getLexicalDeclContext())
Copy link
Collaborator

@shafik shafik Oct 2, 2025

Choose a reason for hiding this comment

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

IT looks like this one goes back to 2013, so I am guessing it used to be const and that changed and this was just missed. The git archeology is not that hard it just requires a few --ignore-rev's. It would of course be nice if this actually worked on github instead of timing out.

<< VD->getSourceRange();
<< VD->getDeclName() << IsCapturedByBlock
<< (Use.getKind() == UninitUse::AfterDecl ? 4 : 5)
<< VD->getLexicalDeclContext() << VD->getSourceRange();
S.Diag(Use.getUser()->getBeginLoc(), diag::note_uninit_var_use)
<< IsCapturedByBlock << Use.getUser()->getSourceRange();
return;
Expand Down
2 changes: 1 addition & 1 deletion clang/lib/Sema/SemaConcept.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ DiagRecursiveConstraintEval(Sema &S, llvm::FoldingSetNodeID &ID,
// Sema::InstantiatingTemplate::isAlreadyBeingInstantiated function.
if (S.SatisfactionStackContains(Templ, ID)) {
S.Diag(E->getExprLoc(), diag::err_constraint_depends_on_self)
<< const_cast<Expr *>(E) << E->getSourceRange();
<< E << E->getSourceRange();
return true;
}

Expand Down
7 changes: 2 additions & 5 deletions clang/lib/Sema/SemaOpenACCAtomic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,9 +454,7 @@ class AtomicOperandChecker {
// If nothing matches, error out.
DiagnoseInvalidAtomic(BinInf->FoundExpr->getExprLoc(),
SemaRef.PDiag(diag::note_acc_atomic_mismatch_operand)
<< const_cast<Expr *>(AssignInf.LHS)
<< const_cast<Expr *>(BinInf->LHS)
<< const_cast<Expr *>(BinInf->RHS));
<< AssignInf.LHS << BinInf->LHS << BinInf->RHS);
return IDACInfo::Fail();
}

Expand Down Expand Up @@ -592,8 +590,7 @@ class AtomicOperandChecker {

PartialDiagnostic PD =
SemaRef.PDiag(diag::note_acc_atomic_mismatch_compound_operand)
<< FirstKind << const_cast<Expr *>(FirstX) << SecondKind
<< const_cast<Expr *>(SecondX);
<< FirstKind << FirstX << SecondKind << SecondX;

return DiagnoseInvalidAtomic(SecondX->getExprLoc(), PD);
}
Expand Down