From 9e4ef69ef80e6ef91c4897f0d6c0f7e47fdfd279 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 23 Sep 2011 14:28:13 +0000 Subject: [PATCH] godump.c (go_define): Treat a single character in single quotes, or a string, as an operand. * godump.c (go_define): Treat a single character in single quotes, or a string, as an operand. From-SVN: r179118 --- gcc/ChangeLog | 5 +++++ gcc/godump.c | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 65f8bce51ea..424404f40f4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2011-09-23 Ian Lance Taylor + + * godump.c (go_define): Treat a single character in single quotes, + or a string, as an operand. + 2011-09-23 Martin Jambor * ipa-prop.h (jump_func_type): Updated comments. diff --git a/gcc/godump.c b/gcc/godump.c index 3f78eead279..11cd32998ec 100644 --- a/gcc/godump.c +++ b/gcc/godump.c @@ -301,11 +301,13 @@ go_define (unsigned int lineno, const char *buffer) case '\'': { char quote; + int count; if (saw_operand) goto unknown; quote = *p; *q++ = *p++; + count = 0; while (*p != quote) { int c; @@ -313,6 +315,8 @@ go_define (unsigned int lineno, const char *buffer) if (*p == '\0') goto unknown; + ++count; + if (*p != '\\') { *q++ = *p++; @@ -358,7 +362,15 @@ go_define (unsigned int lineno, const char *buffer) goto unknown; } } + *q++ = *p++; + + if (quote == '\'' && count != 1) + goto unknown; + + saw_operand = true; + need_operand = false; + break; } -- 2.30.2