From 5aec60eb2f6f0905bfc76f5949fd5d55c6a10f10 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 30 Aug 2017 16:12:56 -0600 Subject: [PATCH] Cast char constant to int in sizeof.exp PR gdb/22010 concerns a regression I introduced with the scalar printing changes. The bug is that this code in sizeof.exp: set signof_byte [get_integer_valueof "'\\377'" -1] can incorrectly compute sizeof_byte. One underlying problem here is that gdb's C parser doesn't treat a char constant as an int (this is PR 19973). However, it seems good to have an immediate fix for the regression. The simplest is to cast to an int here. testsuite/ChangeLog 2017-09-05 Tom Tromey PR gdb/22010: * gdb.base/sizeof.exp (check_valueof): Cast char constant to int. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.base/sizeof.exp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index a4f2a145f7..62d929c837 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-09-05 Tom Tromey + + PR gdb/22010: + * gdb.base/sizeof.exp (check_valueof): Cast char constant to int. + 2017-09-06 Thomas Preud'homme * gdb.arch/thumb2-it.exp: Cast call to assembly defined function. diff --git a/gdb/testsuite/gdb.base/sizeof.exp b/gdb/testsuite/gdb.base/sizeof.exp index 5d8940715c..13d36f8a93 100644 --- a/gdb/testsuite/gdb.base/sizeof.exp +++ b/gdb/testsuite/gdb.base/sizeof.exp @@ -86,7 +86,7 @@ proc check_valueof { exp val } { # Check that GDB and the target agree over the sign of a character. -set signof_byte [get_integer_valueof "'\\377'" -1] +set signof_byte [get_integer_valueof "(int) '\\377'" -1] set signof_char [get_integer_valueof "(int) (char) -1" -1] set signof_signed_char [get_integer_valueof "(int) (signed char) -1" -1] set signof_unsigned_char [get_integer_valueof "(int) (unsigned char) -1" -1]