From: ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 19 Jan 2011 16:03:55 +0000 (+0000)
Subject: Check for error type when getting type of binary expression.
X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=a5fe85715d5f736fd0c07971e282034f5d3c54dc

Check for error type when getting type of binary expression.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@169002 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/go/gofrontend/expressions.cc b/gcc/go/gofrontend/expressions.cc
index 819fb616452..5afe163b760 100644
--- a/gcc/go/gofrontend/expressions.cc
+++ b/gcc/go/gofrontend/expressions.cc
@@ -5396,7 +5396,11 @@ Binary_expression::do_type()
       {
 	Type* left_type = this->left_->type();
 	Type* right_type = this->right_->type();
-	if (!left_type->is_abstract() && left_type->named_type() != NULL)
+	if (left_type->is_error_type())
+	  return left_type;
+	else if (right_type->is_error_type())
+	  return right_type;
+	else if (!left_type->is_abstract() && left_type->named_type() != NULL)
 	  return left_type;
 	else if (!right_type->is_abstract() && right_type->named_type() != NULL)
 	  return right_type;