From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Wed, 27 Jan 2016 00:00:58 +0000 (+0000)
Subject: compiler: Don't crash on erroneous array return types.
X-Git-Tag: basepoints/gcc-7~1302
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82c1a217fe9478361b91ebb8514282b729467991;p=thirdparty%2Fgcc.git

compiler: Don't crash on erroneous array return types.


    Another issue with erroneous array types.  When an erroneous array
    type is in a function's signature, particularly the return type, we
    must guarantee that type is changed into an error type.  Otherwise,
    any operations that work on arrays and slices will crash when applied
    to the erroneous array return type.

    Fixes golang/go#12939.

    Reviewed-on: https://go-review.googlesource.com/16235

From-SVN: r232858
---

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 96a1e9ffe55d..8ece73d81166 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-721c778adb8f99d8a6b7795dbad86013ccc9ba91
+9e68d67d65fd72b9b4f163f2f26e15cd0d3e2cd2
 
 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/parse.cc b/gcc/go/gofrontend/parse.cc
index 9d6a8c6f4a64..5c493700de68 100644
--- a/gcc/go/gofrontend/parse.cc
+++ b/gcc/go/gofrontend/parse.cc
@@ -419,6 +419,8 @@ Parse::array_type(bool may_use_ellipsis)
     }
 
   Type* element_type = this->type();
+  if (element_type->is_error_type())
+    return Type::make_error_type();
 
   return Type::make_array_type(element_type, length);
 }