forked from OSchip/llvm-project
parent
4b1285c55a
commit
8f7f3ea658
|
@ -1628,7 +1628,7 @@ static void handleAnalyzerNoReturnAttr(Sema &S, Decl *D,
|
|||
!VD->getType()->isFunctionPointerType())) {
|
||||
S.Diag(Attr.getLoc(),
|
||||
Attr.isCXX11Attribute() ? diag::err_attribute_wrong_decl_type
|
||||
: diag::warn_attribute_wrong_decl_type)
|
||||
: diag::warn_attribute_wrong_decl_type)
|
||||
<< Attr.getName() << ExpectedFunctionMethodOrBlock;
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -2264,7 +2264,7 @@ static bool CheckMethodOverrideReturn(Sema &S,
|
|||
|
||||
DiagID =
|
||||
IsOverridingMode ? diag::warn_non_covariant_overriding_ret_types
|
||||
: diag::warn_non_covariant_ret_types;
|
||||
: diag::warn_non_covariant_ret_types;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -2348,7 +2348,7 @@ static bool CheckMethodOverrideParam(Sema &S,
|
|||
|
||||
DiagID =
|
||||
IsOverridingMode ? diag::warn_non_contravariant_overriding_param_types
|
||||
: diag::warn_non_contravariant_param_types;
|
||||
: diag::warn_non_contravariant_param_types;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -2357,7 +2357,7 @@ static bool CheckMethodOverrideParam(Sema &S,
|
|||
<< MethodImpl->getDeclName() << IfaceTy << ImplTy;
|
||||
S.Diag(IfaceVar->getLocation(),
|
||||
(IsOverridingMode ? diag::note_previous_declaration
|
||||
: diag::note_previous_definition))
|
||||
: diag::note_previous_definition))
|
||||
<< getTypeRange(IfaceVar->getTypeSourceInfo());
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -3216,7 +3216,7 @@ StmtResult Sema::BuildReturnStmt(SourceLocation ReturnLoc, Expr *RetValExp) {
|
|||
}
|
||||
// return (some void expression); is legal in C++.
|
||||
else if (D != diag::ext_return_has_void_expr ||
|
||||
!getLangOpts().CPlusPlus) {
|
||||
!getLangOpts().CPlusPlus) {
|
||||
NamedDecl *CurDecl = getCurFunctionOrMethodDecl();
|
||||
|
||||
int FunctionKind = 0;
|
||||
|
|
|
@ -2146,7 +2146,7 @@ QualType Sema::BuildArrayType(QualType T, ArrayType::ArraySizeModifier ASM,
|
|||
} else if (ASM != ArrayType::Normal || Quals != 0)
|
||||
Diag(Loc,
|
||||
getLangOpts().CPlusPlus? diag::err_c99_array_usage_cxx
|
||||
: diag::ext_c99_array_usage) << ASM;
|
||||
: diag::ext_c99_array_usage) << ASM;
|
||||
}
|
||||
|
||||
if (T->isVariableArrayType()) {
|
||||
|
|
Loading…
Reference in New Issue