<div dir="ltr">Sorry, this commit was supposed to have a more descriptive commit message.<div><br></div><div>This was a readability enhancement, Diag(Loc, Diag) is confusing and unidiomatic.</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Dec 26, 2014 at 1:06 AM, David Majnemer <span dir="ltr"><<a href="mailto:david.majnemer@gmail.com" target="_blank">david.majnemer@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: majnemer<br>
Date: Fri Dec 26 00:06:53 2014<br>
New Revision: 224843<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=224843&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=224843&view=rev</a><br>
Log:<br>
WIP<br>
<br>
Modified:<br>
cfe/trunk/lib/Sema/SemaExpr.cpp<br>
<br>
Modified: cfe/trunk/lib/Sema/SemaExpr.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExpr.cpp?rev=224843&r1=224842&r2=224843&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExpr.cpp?rev=224843&r1=224842&r2=224843&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Sema/SemaExpr.cpp (original)<br>
+++ cfe/trunk/lib/Sema/SemaExpr.cpp Fri Dec 26 00:06:53 2014<br>
@@ -8630,19 +8630,19 @@ static bool CheckForModifiableLvalue(Exp<br>
if (IsLV == Expr::MLV_Valid)<br>
return false;<br>
<br>
- unsigned Diag = 0;<br>
+ unsigned DiagID = 0;<br>
bool NeedType = false;<br>
switch (IsLV) { // C99 6.5.16p2<br>
case Expr::MLV_ConstQualified:<br>
- Diag = diag::err_typecheck_assign_const;<br>
+ DiagID = diag::err_typecheck_assign_const;<br>
<br>
// Use a specialized diagnostic when we're assigning to an object<br>
// from an enclosing function or block.<br>
if (NonConstCaptureKind NCCK = isReferenceToNonConstCapture(S, E)) {<br>
if (NCCK == NCCK_Block)<br>
- Diag = diag::err_block_decl_ref_not_modifiable_lvalue;<br>
+ DiagID = diag::err_block_decl_ref_not_modifiable_lvalue;<br>
else<br>
- Diag = diag::err_lambda_decl_ref_not_modifiable_lvalue;<br>
+ DiagID = diag::err_lambda_decl_ref_not_modifiable_lvalue;<br>
break;<br>
}<br>
<br>
@@ -8662,18 +8662,18 @@ static bool CheckForModifiableLvalue(Exp<br>
// - self<br>
ObjCMethodDecl *method = S.getCurMethodDecl();<br>
if (method && var == method->getSelfDecl())<br>
- Diag = method->isClassMethod()<br>
+ DiagID = method->isClassMethod()<br>
? diag::err_typecheck_arc_assign_self_class_method<br>
: diag::err_typecheck_arc_assign_self;<br>
<br>
// - fast enumeration variables<br>
else<br>
- Diag = diag::err_typecheck_arr_assign_enumeration;<br>
+ DiagID = diag::err_typecheck_arr_assign_enumeration;<br>
<br>
SourceRange Assign;<br>
if (Loc != OrigLoc)<br>
Assign = SourceRange(OrigLoc, OrigLoc);<br>
- S.Diag(Loc, Diag) << E->getSourceRange() << Assign;<br>
+ S.Diag(Loc, DiagID) << E->getSourceRange() << Assign;<br>
// We need to preserve the AST regardless, so migration tool<br>
// can do its job.<br>
return false;<br>
@@ -8684,37 +8684,37 @@ static bool CheckForModifiableLvalue(Exp<br>
break;<br>
case Expr::MLV_ArrayType:<br>
case Expr::MLV_ArrayTemporary:<br>
- Diag = diag::err_typecheck_array_not_modifiable_lvalue;<br>
+ DiagID = diag::err_typecheck_array_not_modifiable_lvalue;<br>
NeedType = true;<br>
break;<br>
case Expr::MLV_NotObjectType:<br>
- Diag = diag::err_typecheck_non_object_not_modifiable_lvalue;<br>
+ DiagID = diag::err_typecheck_non_object_not_modifiable_lvalue;<br>
NeedType = true;<br>
break;<br>
case Expr::MLV_LValueCast:<br>
- Diag = diag::err_typecheck_lvalue_casts_not_supported;<br>
+ DiagID = diag::err_typecheck_lvalue_casts_not_supported;<br>
break;<br>
case Expr::MLV_Valid:<br>
llvm_unreachable("did not take early return for MLV_Valid");<br>
case Expr::MLV_InvalidExpression:<br>
case Expr::MLV_MemberFunction:<br>
case Expr::MLV_ClassTemporary:<br>
- Diag = diag::err_typecheck_expression_not_modifiable_lvalue;<br>
+ DiagID = diag::err_typecheck_expression_not_modifiable_lvalue;<br>
break;<br>
case Expr::MLV_IncompleteType:<br>
case Expr::MLV_IncompleteVoidType:<br>
return S.RequireCompleteType(Loc, E->getType(),<br>
diag::err_typecheck_incomplete_type_not_modifiable_lvalue, E);<br>
case Expr::MLV_DuplicateVectorComponents:<br>
- Diag = diag::err_typecheck_duplicate_vector_components_not_mlvalue;<br>
+ DiagID = diag::err_typecheck_duplicate_vector_components_not_mlvalue;<br>
break;<br>
case Expr::MLV_NoSetterProperty:<br>
llvm_unreachable("readonly properties should be processed differently");<br>
case Expr::MLV_InvalidMessageExpression:<br>
- Diag = diag::error_readonly_message_assignment;<br>
+ DiagID = diag::error_readonly_message_assignment;<br>
break;<br>
case Expr::MLV_SubObjCPropertySetting:<br>
- Diag = diag::error_no_subobject_property_setting;<br>
+ DiagID = diag::error_no_subobject_property_setting;<br>
break;<br>
}<br>
<br>
@@ -8722,9 +8722,9 @@ static bool CheckForModifiableLvalue(Exp<br>
if (Loc != OrigLoc)<br>
Assign = SourceRange(OrigLoc, OrigLoc);<br>
if (NeedType)<br>
- S.Diag(Loc, Diag) << E->getType() << E->getSourceRange() << Assign;<br>
+ S.Diag(Loc, DiagID) << E->getType() << E->getSourceRange() << Assign;<br>
else<br>
- S.Diag(Loc, Diag) << E->getSourceRange() << Assign;<br>
+ S.Diag(Loc, DiagID) << E->getSourceRange() << Assign;<br>
return true;<br>
}<br>
<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>