From 99e74ab642c49f9a4e2cda32b95e46eee13bc078 Mon Sep 17 00:00:00 2001 From: ian Date: Wed, 30 May 2012 23:04:57 +0000 Subject: [PATCH] compiler: Don't crash for invalid constant types for && or ||. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@188034 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/go/gofrontend/expressions.cc | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/gcc/go/gofrontend/expressions.cc b/gcc/go/gofrontend/expressions.cc index e609be9cfce..f9c80b3aeff 100644 --- a/gcc/go/gofrontend/expressions.cc +++ b/gcc/go/gofrontend/expressions.cc @@ -4475,9 +4475,8 @@ Binary_expression::eval_constant(Operator op, Numeric_constant* left_nc, case OPERATOR_LE: case OPERATOR_GT: case OPERATOR_GE: - // These return boolean values and as such must be handled - // elsewhere. - go_unreachable(); + // These return boolean values, not numeric. + return false; default: break; } @@ -5304,24 +5303,13 @@ Binary_expression::operand_address(Statement_inserter* inserter, bool Binary_expression::do_numeric_constant_value(Numeric_constant* nc) const { - Operator op = this->op_; - - if (op == OPERATOR_EQEQ - || op == OPERATOR_NOTEQ - || op == OPERATOR_LT - || op == OPERATOR_LE - || op == OPERATOR_GT - || op == OPERATOR_GE) - return false; - Numeric_constant left_nc; if (!this->left_->numeric_constant_value(&left_nc)) return false; Numeric_constant right_nc; if (!this->right_->numeric_constant_value(&right_nc)) return false; - - return Binary_expression::eval_constant(op, &left_nc, &right_nc, + return Binary_expression::eval_constant(this->op_, &left_nc, &right_nc, this->location(), nc); } -- 2.11.0