From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2205) id 28B6C3839425; Sat, 4 Jun 2022 11:18:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 28B6C3839425 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom de Vries To: gdb-cvs@sourceware.org Subject: [binutils-gdb] [gdb/ada] Fix literal truncation X-Act-Checkin: binutils-gdb X-Git-Author: Tom de Vries X-Git-Refname: refs/heads/master X-Git-Oldrev: 999f7adc21cdcef5b606d2529068121dc6032b18 X-Git-Newrev: ac3afe36d73c84096685fece885d70b28bc9629f Message-Id: <20220604111814.28B6C3839425@sourceware.org> Date: Sat, 4 Jun 2022 11:18:14 +0000 (GMT) X-BeenThere: gdb-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jun 2022 11:18:14 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Dac3afe36d73c= 84096685fece885d70b28bc9629f commit ac3afe36d73c84096685fece885d70b28bc9629f Author: Tom de Vries Date: Sat Jun 4 13:17:33 2022 +0200 [gdb/ada] Fix literal truncation =20 Make sure we error out on overflow instead of truncating in all cases. =20 Tested on x86_64-linux, with a build with --enable-targets=3Dall. Diff: --- gdb/ada-lex.l | 27 +++++++++++++++++++++++---- gdb/testsuite/gdb.base/parse_number.exp | 4 +--- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/gdb/ada-lex.l b/gdb/ada-lex.l index 33a08eaa93b..002eb811e41 100644 --- a/gdb/ada-lex.l +++ b/gdb/ada-lex.l @@ -466,12 +466,16 @@ processInt (struct parser_state *par_state, const cha= r *base0, if (mpz_cmp (result.val, maxval.val) > 0) error (_("Integer literal out of range")); =20 + int int_bits =3D gdbarch_int_bit (par_state->gdbarch ()); + int long_bits =3D gdbarch_long_bit (par_state->gdbarch ()); + int long_long_bits =3D gdbarch_long_long_bit (par_state->gdbarch ()); + ULONGEST value =3D result.as_integer (); - if ((value >> (gdbarch_int_bit (par_state->gdbarch ())-1)) =3D=3D 0) + if (fits_in_type (1, value, int_bits, true)) yylval.typed_val.type =3D type_int (par_state); - else if ((value >> (gdbarch_long_bit (par_state->gdbarch ())-1)) =3D=3D = 0) + else if (fits_in_type (1, value, long_bits, true)) yylval.typed_val.type =3D type_long (par_state); - else if (((value >> (gdbarch_long_bit (par_state->gdbarch ())-1)) >> 1) = =3D=3D 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 @@ processInt (struct parser_state *par_state, const char= *base0, yylval.typed_val.val =3D (LONGEST) value; return INT; } - else + else if (fits_in_type (1, value, long_long_bits, true)) yylval.typed_val.type =3D 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 =3D type_long_long (par_state); + /* See unsigned long case above. */ + if (value & LONGEST_SIGN) + yylval.typed_val.val =3D + (LONGEST) (value & ~LONGEST_SIGN) + - (LONGEST_SIGN>>1) - (LONGEST_SIGN>>1); + else + yylval.typed_val.val =3D (LONGEST) value; + return INT; + } + else + error (_("Integer literal out of range")); =20 yylval.typed_val.val =3D value; return INT; diff --git a/gdb/testsuite/gdb.base/parse_number.exp b/gdb/testsuite/gdb.ba= se/parse_number.exp index 6e0091278a9..70b0ad065d7 100644 --- a/gdb/testsuite/gdb.base/parse_number.exp +++ b/gdb/testsuite/gdb.base/parse_number.exp @@ -146,9 +146,7 @@ proc parse_number { lang n } { 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 =3D=3D "modula-2" } { if { [string equal $n -0] } {