Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Report WNEGCONSTCOMP also on smaller unsigned int types #216

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Report WNEGCONSTCOMP also on smaller unsigned int types #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions py/dml/ctree.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1243,6 +1243,12 @@ def make(cls, site, lh, rh):
if (lhtype.is_arith and rhtype.is_arith
and lh.constant and rh.constant):
return mkBoolConstant(site, cls.eval_const(lh.value, rh.value))
if (lhtype.is_int and rhtype.is_int
and ((not lhtype.signed and rh.constant and rh.value < 0)
or (not rhtype.signed and lh.constant and lh.value < 0))):
(signed_expr, unsigned_expr) = ((lh, rh) if lhtype.signed
else (rh, lh))
report(WNEGCONSTCOMP(site, signed_expr, unsigned_expr.ctype()))
if lhtype.is_int:
lh = as_int(lh)
lhtype = realtype(lh.ctype())
Expand All @@ -1254,9 +1260,6 @@ def make(cls, site, lh, rh):
and lhtype.signed != rhtype.signed):
(signed_expr, unsigned_expr) = ((lh, rh) if lhtype.signed
else (rh, lh))
if signed_expr.constant and signed_expr.value < 0:
report(WNEGCONSTCOMP(site, signed_expr,
unsigned_expr.ctype()))
# we must convert (uint64)x < (int64)y to DML_lt(x, y), because
# C:'s < would do an unsigned comparison. No need to do this if y
# is a small constant, though.
Expand Down Expand Up @@ -1450,6 +1453,12 @@ def make(cls, site, lh, rh):
assert isinstance(expr, (NullConstant, StringConstant,
AddressOfMethod))
return mkBoolConstant(site, False)
if (lhtype.is_int and rhtype.is_int
and ((not lhtype.signed and rh.constant and rh.value < 0)
or (not rhtype.signed and lh.constant and lh.value < 0))):
(signed_expr, unsigned_expr) = ((lh, rh) if lhtype.signed
else (rh, lh))
report(WNEGCONSTCOMP(site, signed_expr, unsigned_expr.ctype()))
if lhtype.is_int:
lh = as_int(lh)
lhtype = realtype(lh.ctype())
Expand All @@ -1465,8 +1474,6 @@ def make(cls, site, lh, rh):
# unsigned to a constant literal.
(signed_expr, unsigned_expr) = ((lh, rh) if lhtype.signed
else (rh, lh))
if signed_expr.constant and signed_expr.value < 0:
report(WNEGCONSTCOMP(site, signed_expr, unsigned_expr.ctype()))
if not (signed_expr.constant and 0 <= signed_expr.value < 1 << 63):
return mkApply(
site, mkLit(
Expand Down
5 changes: 5 additions & 0 deletions test/1.4/errors/T_WNEGCONSTCOMP.dml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ method init() {
assert a >= -1;
/// WARNING WNEGCONSTCOMP
assert !(a <= -1);
local uint32 c = -1;
/// WARNING WNEGCONSTCOMP
assert c != -1;
/// WARNING WNEGCONSTCOMP
assert c > -1;

// Sanity
local int64 b = -1;
Expand Down