diff options
| author | Rong Xu <xur@google.com> | 2014-09-02 15:29:57 -0700 |
|---|---|---|
| committer | Rong Xu <xur@google.com> | 2014-09-02 15:29:57 -0700 |
| commit | e97c99f15937e5762a973b25192aab824126a6d3 (patch) | |
| tree | 7f0be3ff7c7d976af06887dc50accd68f7630a7f /gcc-4.9/gcc/cp/parser.c | |
| parent | f1c18afafc2b321465ae6b07ede127095942d7dc (diff) | |
| download | toolchain_gcc-e97c99f15937e5762a973b25192aab824126a6d3.tar.gz toolchain_gcc-e97c99f15937e5762a973b25192aab824126a6d3.tar.bz2 toolchain_gcc-e97c99f15937e5762a973b25192aab824126a6d3.zip | |
[gcc-4.9] Merge svn r214745 from google/gcc-4_9 branch.
Merge gcc-4_9 source r214745 from google/gcc-4_9 branch.
Change-Id: Ie6fa0fd72f4b4eec3adc4db4bb922e652d1c2605
Diffstat (limited to 'gcc-4.9/gcc/cp/parser.c')
| -rw-r--r-- | gcc-4.9/gcc/cp/parser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc-4.9/gcc/cp/parser.c b/gcc-4.9/gcc/cp/parser.c index 706f6c020..88478bf13 100644 --- a/gcc-4.9/gcc/cp/parser.c +++ b/gcc-4.9/gcc/cp/parser.c @@ -6306,7 +6306,7 @@ cp_parser_array_notation (location_t loc, cp_parser *parser, tree *init_index, parser->colon_corrects_to_scope_p = saved_colon_corrects; if (*init_index == error_mark_node || length_index == error_mark_node - || stride == error_mark_node) + || stride == error_mark_node || array_type == error_mark_node) { if (cp_lexer_peek_token (parser->lexer)->type == CPP_CLOSE_SQUARE) cp_lexer_consume_token (parser->lexer); |