From: Ian Lance Taylor <iant@google.com>
Date: Fri, 8 Aug 2014 17:40:51 +0000 (+0000)
Subject: go-gcc.cc (Gcc_backend::compound_statement): Don't return NULL_TREE.
X-Git-Tag: releases/gcc-5.1.0~5579
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ff09769fac4d76ae93c1ca473d788b9be6809923;p=thirdparty%2Fgcc.git

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 069618d2ca83..f7c44c5f1126 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 97904d06d435..a34fad8bfd73 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);
 }