On Mon, Feb 01, 2016 at 03:44:38AM +0100, Nicolai Stange wrote: > The official constraints on constant expressions [6.6] are insanely > strict in that they do not allow some constructs commonly used in the > wild. > > Relax them by treating > - address constants cast to different pointer type as address constants > again, > - address constants cast to arithmetic type as arithmetic constant > expressions > - conditional expressions whose true and false branches both yield > address constants as address constants, > - and conditional expressions whose condition is an address constant > as an constant expression to the extent their true and false branches > allow. > > Signed-off-by: Nicolai Stange <nicstange@xxxxxxxxx> > --- > diff --git a/evaluate.c b/evaluate.c > index 0101e61..ff51d84 100644 > --- a/evaluate.c > +++ b/evaluate.c > @@ -1129,14 +1129,23 @@ static struct symbol *evaluate_conditional_expression(struct expression *expr) ... > * A conditional operator never yields an address constant > * [6.6(9)]. > + * However, as an extension, if the condition is any constant > + * expression, and the true and false expressions are both > + * address constants, mark the result as an address constant. > */ The comment make perfect sense in the patch serie because it explain exactly what the incremental patch is doing. But once the patch is applied it's not what the code is really doing: the result is not marked as an address constant, it's only not unmarked anymore. So, I think it's better to restrict it to something like: However as an extension also accept address constant. > - expr->constexpr_flags = (expr->conditional->constexpr_flags & > - (*true)->constexpr_flags & > - expr->cond_false->constexpr_flags & > - ~CONSTEXPR_FLAG_DECAY_CONSTS_MASK & > - ~CONSTEXPR_FLAG_ADDR_CONST); > + if (expr->conditional->constexpr_flags & > + (CONSTEXPR_FLAG_ARITH_CONST_EXPR | CONSTEXPR_FLAG_ADDR_CONST)) The 'if' expression could be simplified (!CONSTEXPR_FLAG_NON) > + expr->constexpr_flags = (*true)->constexpr_flags & > + expr->cond_false->constexpr_flags & > + ~CONSTEXPR_FLAG_DECAY_CONSTS_MASK; > > lclass = classify_type(ltype, <ype); > rclass = classify_type(rtype, &rtype); -- To unsubscribe from this list: send the line "unsubscribe linux-sparse" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
