This is an archive of the discontinued LLVM Phabricator instance.

Differential D124054

[NFC] Avoid unnecessary duplication of code generating diagnostic.
ClosedPublic

Authored by delcypher on Apr 19 2022, 5:31 PM.

Details

Reviewers
rapidsna
fcloutier
aaron.ballman
Commits
rG3d612a930dce: [NFC] Avoid unnecessary duplication of code generating diagnostic.
Summary

The previous code unneccessarily duplicated the creation of a diagnostic
where the only difference was the AssignmentAction being passed.

rdar://88664722

Diff Detail

Event Timeline

delcypher created this revision.Apr 19 2022, 5:31 PM
Herald added a project: Restricted Project. · View Herald TranscriptApr 19 2022, 5:31 PM
delcypher requested review of this revision.Apr 19 2022, 5:31 PM
Herald added a project: Restricted Project. · View Herald TranscriptApr 19 2022, 5:31 PM
Harbormaster completed remote builds in B160350: Diff 423776.Apr 19 2022, 6:08 PM
aaron.ballman accepted this revision.Apr 20 2022, 9:19 AM

LGTM!

This revision is now accepted and ready to land.Apr 20 2022, 9:19 AM
Closed by commit rG3d612a930dce: [NFC] Avoid unnecessary duplication of code generating diagnostic. (authored by delcypher). · Explain WhyApr 20 2022, 10:50 AM
This revision was automatically updated to reflect the committed changes.
delcypher added a commit: rG3d612a930dce: [NFC] Avoid unnecessary duplication of code generating diagnostic..
delcypher added a comment.Apr 20 2022, 10:51 AM

@aaron.ballman Thanks.

Revision Contents

PathSize
clang/
lib/
Sema/
8 lines

Diff 423776

clang/lib/Sema/SemaExpr.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 16,937 Lines • ▼ Show 20 Linesbool Sema::DiagnoseAssignmentResult(AssignConvertType ConvTy,
case AA_Casting: case AA_Casting:
// The source type comes first. // The source type comes first.
FirstType = SrcType; FirstType = SrcType;
SecondType = DstType; SecondType = DstType;
break; break;
} }
PartialDiagnostic FDiag = PDiag(DiagKind); PartialDiagnostic FDiag = PDiag(DiagKind);
AssignmentAction ActionForDiag = Action;
if (Action == AA_Passing_CFAudited) if (Action == AA_Passing_CFAudited)
FDiag << FirstType << SecondType << AA_Passing << SrcExpr->getSourceRange(); ActionForDiag = AA_Passing;
else
FDiag << FirstType << SecondType << Action << SrcExpr->getSourceRange(); FDiag << FirstType << SecondType << ActionForDiag
<< SrcExpr->getSourceRange();
if (DiagKind == diag::ext_typecheck_convert_incompatible_pointer_sign || if (DiagKind == diag::ext_typecheck_convert_incompatible_pointer_sign ||
DiagKind == diag::err_typecheck_convert_incompatible_pointer_sign) { DiagKind == diag::err_typecheck_convert_incompatible_pointer_sign) {
auto isPlainChar = [](const clang::Type *Type) { auto isPlainChar = [](const clang::Type *Type) {
return Type->isSpecificBuiltinType(BuiltinType::Char_S) || return Type->isSpecificBuiltinType(BuiltinType::Char_S) ||
Type->isSpecificBuiltinType(BuiltinType::Char_U); Type->isSpecificBuiltinType(BuiltinType::Char_U);
}; };
FDiag << (isPlainChar(FirstType->getPointeeOrArrayElementType()) || FDiag << (isPlainChar(FirstType->getPointeeOrArrayElementType()) ||
▲ Show 20 Lines • Show All 3,758 Lines • Show Last 20 Lines