Skip to content

Commit f03ad8b

Browse files
tbaederrmahesh-attarde
authored andcommitted
[clang][NFC] Remove const_casts from diagnostic emissions (llvm#161211)
This is apparently not necessary anymore. Not sure when exactly it changed though.
1 parent 471f1d0 commit f03ad8b

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

clang/lib/Sema/AnalysisBasedWarnings.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -983,10 +983,9 @@ static void DiagUninitUse(Sema &S, const VarDecl *VD, const UninitUse &Use,
983983
case UninitUse::AfterDecl:
984984
case UninitUse::AfterCall:
985985
S.Diag(VD->getLocation(), diag::warn_sometimes_uninit_var)
986-
<< VD->getDeclName() << IsCapturedByBlock
987-
<< (Use.getKind() == UninitUse::AfterDecl ? 4 : 5)
988-
<< const_cast<DeclContext*>(VD->getLexicalDeclContext())
989-
<< VD->getSourceRange();
986+
<< VD->getDeclName() << IsCapturedByBlock
987+
<< (Use.getKind() == UninitUse::AfterDecl ? 4 : 5)
988+
<< VD->getLexicalDeclContext() << VD->getSourceRange();
990989
S.Diag(Use.getUser()->getBeginLoc(), diag::note_uninit_var_use)
991990
<< IsCapturedByBlock << Use.getUser()->getSourceRange();
992991
return;

clang/lib/Sema/SemaConcept.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ DiagRecursiveConstraintEval(Sema &S, llvm::FoldingSetNodeID &ID,
193193
// Sema::InstantiatingTemplate::isAlreadyBeingInstantiated function.
194194
if (S.SatisfactionStackContains(Templ, ID)) {
195195
S.Diag(E->getExprLoc(), diag::err_constraint_depends_on_self)
196-
<< const_cast<Expr *>(E) << E->getSourceRange();
196+
<< E << E->getSourceRange();
197197
return true;
198198
}
199199

clang/lib/Sema/SemaOpenACCAtomic.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -454,9 +454,7 @@ class AtomicOperandChecker {
454454
// If nothing matches, error out.
455455
DiagnoseInvalidAtomic(BinInf->FoundExpr->getExprLoc(),
456456
SemaRef.PDiag(diag::note_acc_atomic_mismatch_operand)
457-
<< const_cast<Expr *>(AssignInf.LHS)
458-
<< const_cast<Expr *>(BinInf->LHS)
459-
<< const_cast<Expr *>(BinInf->RHS));
457+
<< AssignInf.LHS << BinInf->LHS << BinInf->RHS);
460458
return IDACInfo::Fail();
461459
}
462460

@@ -592,8 +590,7 @@ class AtomicOperandChecker {
592590

593591
PartialDiagnostic PD =
594592
SemaRef.PDiag(diag::note_acc_atomic_mismatch_compound_operand)
595-
<< FirstKind << const_cast<Expr *>(FirstX) << SecondKind
596-
<< const_cast<Expr *>(SecondX);
593+
<< FirstKind << FirstX << SecondKind << SecondX;
597594

598595
return DiagnoseInvalidAtomic(SecondX->getExprLoc(), PD);
599596
}

0 commit comments

Comments
 (0)