Re: [PATCH 6/8] [gdb/rust] Fix literal truncation

[Tom de Vries <tdevries@suse.de>]

[-- Attachment #1: Type: text/plain, Size: 1354 bytes --]

On 5/26/22 19:17, Tom Tromey wrote:
>>>>>> "Tom" == Tom de Vries via Gdb-patches <gdb-patches@sourceware.org> writes:
> 
> Tom> Make sure we error out on overflow instead of truncating in all cases.
> Tom> I've used as overflow string: "Integer literal is too large", based
> Tom> on what I found at
> Tom> <rust-lang/rust>/src/test/ui/parser/int-literal-too-large-span.rs
> Tom> but perhaps someone has a better idea.
> 
> Tom> -      value = strtoulst (number.c_str () + offset, NULL, radix);
> Tom> +      const char *trailer;
> Tom> +      value = strtoulst (number.c_str () + offset, &trailer, radix);
> Tom> +      if (*trailer != '\0')
> Tom> +	error ("Integer literal is too large");
> 
> This seems fine, though I think it's normal to use _() around the
> argument to error.
> 

Indeed, and I forgot to follow up on that before commit.  Fixed in this 
commit.

> Tom> +	} elseif { $lang == "rust" } {
> Tom> +	    set re_overflow "Integer literal is too large"
> 
> I don't mind if this is there, but normally the Rust lexer uses unit
> tests.  They are in rust-parse.c, see rust_lex_tests.

Ack, and I did wonder whether it would be a good idea to port the entire 
test-case to the unit tests, since it might help with the test duration 
and enable us to test for all archs again.

For now though, I'm leaving things as they are.

Thanks,
- Tom

[-- Attachment #2: 0001-gdb-rust-Add-missing-_-for-error-call.patch --]
[-- Type: text/x-patch, Size: 786 bytes --]

[gdb/rust] Add missing _() for error call

In commit 1390b65a1b9 ("[gdb/rust] Fix literal truncation") I forgot to add
_() around a string using in an error call.

Fix this by adding the missing _().

Tested on x86_64-linux.

---
 gdb/rust-parse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdb/rust-parse.c b/gdb/rust-parse.c
index 836f49108f8..f5eb63ec1e3 100644
--- a/gdb/rust-parse.c
+++ b/gdb/rust-parse.c
@@ -1027,7 +1027,7 @@ rust_parser::lex_number ()
       const char *trailer;
       value = strtoulst (number.c_str () + offset, &trailer, radix);
       if (*trailer != '\0')
-	error ("Integer literal is too large");
+	error (_("Integer literal is too large"));
       if (implicit_i32 && value >= ((uint64_t) 1) << 31)
 	type = get_type ("i64");