From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Thu, 23 Dec 2010 01:22:32 +0000 (+0000)
Subject: Don't crash building map descriptor for erroneous map.
X-Git-Tag: releases/gcc-4.6.0~1643
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d65de21235ee355ae15350fb119a5be371edb4b;p=thirdparty%2Fgcc.git

Don't crash building map descriptor for erroneous map.

From-SVN: r168197
---

diff --git a/gcc/go/gofrontend/gogo-tree.cc b/gcc/go/gofrontend/gogo-tree.cc
index a5fb5f675892..05a701feffc5 100644
--- a/gcc/go/gofrontend/gogo-tree.cc
+++ b/gcc/go/gofrontend/gogo-tree.cc
@@ -2356,6 +2356,8 @@ Gogo::map_descriptor(Map_type* maptype)
   Map_descriptors::iterator p = ins.first;
   if (!ins.second)
     {
+      if (p->second == error_mark_node)
+	return error_mark_node;
       gcc_assert(p->second != NULL_TREE && DECL_P(p->second));
       return build_fold_addr_expr(p->second);
     }
@@ -2385,7 +2387,10 @@ Gogo::map_descriptor(Map_type* maptype)
 					"__val",
 					valtype->get_tree(this));
   if (map_entry_type == error_mark_node)
-    return error_mark_node;
+    {
+      p->second = error_mark_node;
+      return error_mark_node;
+    }
 
   tree map_entry_key_field = DECL_CHAIN(TYPE_FIELDS(map_entry_type));
   gcc_assert(strcmp(IDENTIFIER_POINTER(DECL_NAME(map_entry_key_field)),