compiler: permit expressions of abstract bool to remain abstract

Test case is https://go.dev/cl/414755.

Fixes golang/go#51475

Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/414735

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 16d274c..a0e386a 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-927528cdc112fc51e0d07ee79e7a1254b586eabe
+28fe9fad4acb4e02083faf5503b06e3e6e8eecaf
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.

diff --git a/gcc/go/gofrontend/expressions.cc b/gcc/go/gofrontend/expressions.cc
index f59f61d..aadca97 100644 (file)
--- a/gcc/go/gofrontend/expressions.cc
+++ b/gcc/go/gofrontend/expressions.cc
@@ -6829,11 +6829,12 @@ Binary_expression::do_determine_type(const Type_context* context)
     {
       if ((tleft->integer_type() != NULL && tright->integer_type() != NULL)
          || (tleft->float_type() != NULL && tright->float_type() != NULL)
-         || (tleft->complex_type() != NULL && tright->complex_type() != NULL))
+         || (tleft->complex_type() != NULL && tright->complex_type() != NULL)
+         || (tleft->is_boolean_type() && tright->is_boolean_type()))
        {
-         // Both sides have an abstract integer, abstract float, or
-         // abstract complex type.  Just let CONTEXT determine
-         // whether they may remain abstract or not.
+         // Both sides have an abstract integer, abstract float,
+         // abstract complex, or abstract boolean type.  Just let
+         // CONTEXT determine whether they may remain abstract or not.
        }
       else if (tleft->complex_type() != NULL)
        subcontext.type = tleft;