PR11594: Don't blindly build a UnaryOperator UO_Minus on an expression which
might not be an rvalue when checking array accesses. Instead, pass through a flag indicating the array index is negated. llvm-svn: 146753
This commit is contained in:
parent
6bb2f1d5b5
commit
13f6718b42
|
@ -6200,7 +6200,7 @@ public:
|
|||
private:
|
||||
void CheckArrayAccess(const Expr *BaseExpr, const Expr *IndexExpr,
|
||||
const ArraySubscriptExpr *ASE=0,
|
||||
bool AllowOnePastEnd=true);
|
||||
bool AllowOnePastEnd=true, bool IndexNegated=false);
|
||||
void CheckArrayAccess(const Expr *E);
|
||||
bool CheckFunctionCall(FunctionDecl *FDecl, CallExpr *TheCall);
|
||||
bool CheckBlockCall(NamedDecl *NDecl, CallExpr *TheCall);
|
||||
|
|
|
@ -4277,7 +4277,7 @@ static bool IsTailPaddedMemberArray(Sema &S, llvm::APInt Size,
|
|||
|
||||
void Sema::CheckArrayAccess(const Expr *BaseExpr, const Expr *IndexExpr,
|
||||
const ArraySubscriptExpr *ASE,
|
||||
bool AllowOnePastEnd) {
|
||||
bool AllowOnePastEnd, bool IndexNegated) {
|
||||
IndexExpr = IndexExpr->IgnoreParenCasts();
|
||||
if (IndexExpr->isValueDependent())
|
||||
return;
|
||||
|
@ -4292,6 +4292,8 @@ void Sema::CheckArrayAccess(const Expr *BaseExpr, const Expr *IndexExpr,
|
|||
llvm::APSInt index;
|
||||
if (!IndexExpr->EvaluateAsInt(index, Context))
|
||||
return;
|
||||
if (IndexNegated)
|
||||
index = -index;
|
||||
|
||||
const NamedDecl *ND = NULL;
|
||||
if (const DeclRefExpr *DRE = dyn_cast<DeclRefExpr>(BaseExpr))
|
||||
|
|
|
@ -6203,11 +6203,9 @@ QualType Sema::CheckSubtractionOperands(ExprResult &LHS, ExprResult &RHS,
|
|||
if (!checkArithmeticOpPointerOperand(*this, Loc, LHS.get()))
|
||||
return QualType();
|
||||
|
||||
Expr *IExpr = RHS.get()->IgnoreParenCasts();
|
||||
UnaryOperator negRex(IExpr, UO_Minus, IExpr->getType(), VK_RValue,
|
||||
OK_Ordinary, IExpr->getExprLoc());
|
||||
// Check array bounds for pointer arithemtic
|
||||
CheckArrayAccess(LHS.get()->IgnoreParenCasts(), &negRex);
|
||||
CheckArrayAccess(LHS.get(), RHS.get(), /*ArraySubscriptExpr*/0,
|
||||
/*AllowOnePastEnd*/true, /*IndexNegated*/true);
|
||||
|
||||
if (CompLHSTy) *CompLHSTy = LHS.get()->getType();
|
||||
return LHS.get()->getType();
|
||||
|
|
|
@ -12,3 +12,10 @@ void* broken (struct ext2_super_block *es,int a)
|
|||
{
|
||||
return (void *)es->s_uuid + 80; // expected-warning {{refers past the end of the array}}
|
||||
}
|
||||
|
||||
// Test case reduced from PR11594
|
||||
struct S { int n; };
|
||||
void pr11594(struct S *s) {
|
||||
int a[10];
|
||||
int *p = a - s->n;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue