[gdb/ada] Fix literal truncation
Make sure we error out on overflow instead of truncating in all cases.
Tested on x86_64-linux, with a build with --enable-targets=all.
diff --git a/gdb/ada-lex.l b/gdb/ada-lex.l
index 33a08ea..002eb81 100644
--- a/gdb/ada-lex.l
+++ b/gdb/ada-lex.l
@@ -466,12 +466,16 @@
if (mpz_cmp (result.val, maxval.val) > 0)
error (_("Integer literal out of range"));
+ int int_bits = gdbarch_int_bit (par_state->gdbarch ());
+ int long_bits = gdbarch_long_bit (par_state->gdbarch ());
+ int long_long_bits = gdbarch_long_long_bit (par_state->gdbarch ());
+
ULONGEST value = result.as_integer<ULONGEST> ();
- if ((value >> (gdbarch_int_bit (par_state->gdbarch ())-1)) == 0)
+ if (fits_in_type (1, value, int_bits, true))
yylval.typed_val.type = type_int (par_state);
- else if ((value >> (gdbarch_long_bit (par_state->gdbarch ())-1)) == 0)
+ else if (fits_in_type (1, value, long_bits, true))
yylval.typed_val.type = type_long (par_state);
- else if (((value >> (gdbarch_long_bit (par_state->gdbarch ())-1)) >> 1) == 0)
+ else if (fits_in_type (1, value, long_bits, false))
{
/* We have a number representable as an unsigned integer quantity.
For consistency with the C treatment, we will treat it as an
@@ -490,8 +494,23 @@
yylval.typed_val.val = (LONGEST) value;
return INT;
}
- else
+ else if (fits_in_type (1, value, long_long_bits, true))
yylval.typed_val.type = type_long_long (par_state);
+ else if (fits_in_type (1, value, long_long_bits, false))
+ {
+ /* Note: Interprets ULLONG_MAX as -1. */
+ yylval.typed_val.type = type_long_long (par_state);
+ /* See unsigned long case above. */
+ if (value & LONGEST_SIGN)
+ yylval.typed_val.val =
+ (LONGEST) (value & ~LONGEST_SIGN)
+ - (LONGEST_SIGN>>1) - (LONGEST_SIGN>>1);
+ else
+ yylval.typed_val.val = (LONGEST) value;
+ return INT;
+ }
+ else
+ error (_("Integer literal out of range"));
yylval.typed_val.val = value;
return INT;
diff --git a/gdb/testsuite/gdb.base/parse_number.exp b/gdb/testsuite/gdb.base/parse_number.exp
index 6e00912..70b0ad0 100644
--- a/gdb/testsuite/gdb.base/parse_number.exp
+++ b/gdb/testsuite/gdb.base/parse_number.exp
@@ -146,9 +146,7 @@
return [list "<$sizeof_long_long-byte integer>" $n]
} else {
# Overflow.
- # Some truncated value or re_overflow, should be re_overflow.
- return [list "($re_overflow|<$decimal-byte integer>)" \
- ($re_overflow|$any)]
+ return [list $re_overflow $re_overflow]
}
} elseif { $lang == "modula-2" } {
if { [string equal $n -0] } {
