[clang] 4fd91b0 - Remove an unused variable in Clang.
Nadav Rotem via cfe-commits
cfe-commits at lists.llvm.org
Thu Jul 16 12:49:46 PDT 2020
Author: Nadav Rotem
Date: 2020-07-16T12:48:48-07:00
New Revision: 4fd91b0f946f49370a3ab33c480a807a3f48b247
URL: https://github.com/llvm/llvm-project/commit/4fd91b0f946f49370a3ab33c480a807a3f48b247
DIFF: https://github.com/llvm/llvm-project/commit/4fd91b0f946f49370a3ab33c480a807a3f48b247.diff
LOG: Remove an unused variable in Clang.
https://reviews.llvm.org/D83788
Added:
Modified:
clang/lib/Sema/SemaExpr.cpp
Removed:
################################################################################
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
index ccae79636f32..8fd0e2892b14 100644
--- a/clang/lib/Sema/SemaExpr.cpp
+++ b/clang/lib/Sema/SemaExpr.cpp
@@ -15543,7 +15543,6 @@ bool Sema::DiagnoseAssignmentResult(AssignConvertType ConvTy,
bool CheckInferredResultType = false;
bool isInvalid = false;
unsigned DiagKind = 0;
- FixItHint Hint;
ConversionFixItGenerator ConvHints;
bool MayHaveConvFixit = false;
bool MayHaveFunctionDiff = false;
@@ -15596,10 +15595,9 @@ bool Sema::DiagnoseAssignmentResult(AssignConvertType ConvTy,
}
CheckInferredResultType = DstType->isObjCObjectPointerType() &&
SrcType->isObjCObjectPointerType();
- if (Hint.isNull() && !CheckInferredResultType) {
+ if (!CheckInferredResultType) {
ConvHints.tryToFixConversion(SrcExpr, SrcType, DstType, *this);
- }
- else if (CheckInferredResultType) {
+ } else if (CheckInferredResultType) {
SrcType = SrcType.getUnqualifiedType();
DstType = DstType.getUnqualifiedType();
}
@@ -15768,13 +15766,11 @@ bool Sema::DiagnoseAssignmentResult(AssignConvertType ConvTy,
FDiag << FirstType << SecondType << Action << SrcExpr->getSourceRange();
// If we can fix the conversion, suggest the FixIts.
- assert(ConvHints.isNull() || Hint.isNull());
if (!ConvHints.isNull()) {
for (FixItHint &H : ConvHints.Hints)
FDiag << H;
- } else {
- FDiag << Hint;
}
+
if (MayHaveConvFixit) { FDiag << (unsigned) (ConvHints.Kind); }
if (MayHaveFunctionDiff)
More information about the cfe-commits
mailing list