diff options
Diffstat (limited to 'gcc/go')
| -rw-r--r-- | gcc/go/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/go/go-gcc.cc | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/gcc/go/ChangeLog b/gcc/go/ChangeLog index 069618d..f7c44c5 100644 --- a/gcc/go/ChangeLog +++ b/gcc/go/ChangeLog @@ -1,3 +1,8 @@ +2014-08-08 Ian Lance Taylor <iant@google.com> + + * go-gcc.cc (Gcc_backend::compound_statement): Don't return + NULL_TREE. + 2014-07-24 Uros Bizjak <ubizjak@gmail.com> * go-gcc.cc (Gcc_backend::global_variable_set_init): Rename diff --git a/gcc/go/go-gcc.cc b/gcc/go/go-gcc.cc index 97904d0..a34fad8 100644 --- a/gcc/go/go-gcc.cc +++ b/gcc/go/go-gcc.cc @@ -2123,6 +2123,12 @@ Gcc_backend::compound_statement(Bstatement* s1, Bstatement* s2) if (t == error_mark_node) return this->error_statement(); append_to_statement_list(t, &stmt_list); + + // If neither statement has any side effects, stmt_list can be NULL + // at this point. + if (stmt_list == NULL_TREE) + stmt_list = integer_zero_node; + return this->make_statement(stmt_list); } |