go-gcc.cc (Gcc_backend::compound_statement): Don't return NULL_TREE.

	* go-gcc.cc (Gcc_backend::compound_statement): Don't return
	NULL_TREE.

From-SVN: r213761

diff --git a/gcc/go/ChangeLog b/gcc/go/ChangeLog
index 069618d2ca83e13a4c58c24d25a0a19205546213..f7c44c5f11266b446d318512e4ee3ca0725ce116 100644 (file)
--- 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 97904d06d4352b5669be1647031a8324f63e5cfc..a34fad8bfd73add3d12bb0451d5e5183a22a42a8 100644 (file)
--- 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);
 }