diff options
| author | Jakub Jelinek <jakub@gcc.gnu.org> | 2009-04-01 15:32:22 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2009-04-01 15:32:22 +0200 |
| commit | b85eb797e2ffda39def175285b334b721c0b2b4f (patch) | |
| tree | 08ff9013ac51f3577a317f758fd39f710527edf1 /gcc | |
| parent | 00c7e24fddb113e87566ede396a0d775664c4afb (diff) | |
| download | gcc-b85eb797e2ffda39def175285b334b721c0b2b4f.zip gcc-b85eb797e2ffda39def175285b334b721c0b2b4f.tar.gz gcc-b85eb797e2ffda39def175285b334b721c0b2b4f.tar.bz2 | |
re PR c/37772 (ICE with empty asm statement)
PR c/37772
* c-parser.c (c_parser_asm_statement): Skip until close paren and
return if c_parser_asm_string_literal returned NULL.
* gcc.dg/pr37772.c: New test.
* g++.dg/ext/asm11.C: New test.
From-SVN: r145401
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/c-parser.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 11 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/ext/asm11.C | 20 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/pr37772.c | 20 |
5 files changed, 61 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 327d33d..54cad4c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2009-04-01 Jakub Jelinek <jakub@redhat.com> + + PR c/37772 + * c-parser.c (c_parser_asm_statement): Skip until close paren and + return if c_parser_asm_string_literal returned NULL. + 2009-04-01 Nick Clifton <nickc@redhat.com> * config/m32c/m32c.h (LIBGCC2_UNITS_PER_WORD): Define if not diff --git a/gcc/c-parser.c b/gcc/c-parser.c index 03a7194..1be2ae5 100644 --- a/gcc/c-parser.c +++ b/gcc/c-parser.c @@ -4193,6 +4193,12 @@ c_parser_asm_statement (c_parser *parser) return NULL_TREE; } str = c_parser_asm_string_literal (parser); + if (str == NULL_TREE) + { + parser->lex_untranslated_string = false; + c_parser_skip_until_found (parser, CPP_CLOSE_PAREN, NULL); + return NULL_TREE; + } if (c_parser_next_token_is (parser, CPP_CLOSE_PAREN)) { simple = true; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ee6dbb5..5aef381 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,7 +1,14 @@ +2009-04-01 Jakub Jelinek <jakub@redhat.com> + + PR c/37772 + * gcc.dg/pr37772.c: New test. + * g++.dg/ext/asm11.C: New test. + 2009-04-01 H.J. Lu <hongjiu.lu@intel.com> - (restore_ld_library_path_env_vars): Always restore GCC_EXEC_PREFIX - to its original value, or unset if it was not defined. + * lib/target-libpath.exp (restore_ld_library_path_env_vars): Always + restore GCC_EXEC_PREFIX to its original value, or unset if it was not + defined. 2009-03-31 Jason Merrill <jason@redhat.com> diff --git a/gcc/testsuite/g++.dg/ext/asm11.C b/gcc/testsuite/g++.dg/ext/asm11.C new file mode 100644 index 0000000..7939aac --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/asm11.C @@ -0,0 +1,20 @@ +// PR c/37772 +// { dg-do compile } +// { dg-options "" } + +void +foo () +{ + int i; + asm (); // { dg-error "expected string-literal before" } + asm (1); // { dg-error "expected string-literal before" } + asm (int); // { dg-error "expected string-literal before" } + asm (: "=r" (i)); // { dg-error "expected string-literal before" } + asm (1 : "=r" (i)); // { dg-error "expected string-literal before" } + asm (int : "=r" (i)); // { dg-error "expected string-literal before" } + asm (: : "r" (i)); // { dg-error "expected string-literal before" } + asm (1 : : "r" (i)); // { dg-error "expected string-literal before" } + asm (int : : "r" (i)); // { dg-error "expected string-literal before" } + asm (: : : "memory"); // { dg-error "expected string-literal before" } + asm (1 : : : "memory"); // { dg-error "expected string-literal before" } +} diff --git a/gcc/testsuite/gcc.dg/pr37772.c b/gcc/testsuite/gcc.dg/pr37772.c new file mode 100644 index 0000000..26051c7 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr37772.c @@ -0,0 +1,20 @@ +/* PR c/37772 */ +/* { dg-do compile } */ +/* { dg-options "" } */ + +void +foo () +{ + int i; + asm (); /* { dg-error "expected string literal before" } */ + asm (1); /* { dg-error "expected string literal before" } */ + asm (int); /* { dg-error "expected string literal before" } */ + asm (: "=r" (i)); /* { dg-error "expected string literal before" } */ + asm (1 : "=r" (i)); /* { dg-error "expected string literal before" } */ + asm (int : "=r" (i)); /* { dg-error "expected string literal before" } */ + asm (: : "r" (i)); /* { dg-error "expected string literal before" } */ + asm (1 : : "r" (i)); /* { dg-error "expected string literal before" } */ + asm (int : : "r" (i)); /* { dg-error "expected string literal before" } */ + asm (: : : "memory"); /* { dg-error "expected string literal before" } */ + asm (1 : : : "memory"); /* { dg-error "expected string literal before" } */ +} |