From: Per Bothner <per@bothner.com>
Date: Wed, 27 Sep 1995 18:47:22 +0000 (+0000)
Subject: 	* valops.c (search_struct_field):  Also allow "else" as a variant name,
X-Git-Tag: gdb-4_18~10739
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4c2260aa5c261f7bfb26dcf3aa7c67876720b17e;p=external%2Fbinutils.git

	* valops.c (search_struct_field):  Also allow "else" as a variant name,
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fe104ce..49ff547 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,7 @@
 Wed Sep 27 10:14:36 1995  Per Bothner  <bothner@kalessin.cygnus.com>
 
+	* valops.c (search_struct_field):  Also allow "else" as a variant name,
+
 	* eval.c (evaluate_struct_tuple):  New function.  Used to evaluate
 	structure tuples.  Now also handles Chill variant records.
 	(get_label):  New function, used by evaluate_struct_tuple.
diff --git a/gdb/valops.c b/gdb/valops.c
index 46a22a2..b4bfde8 100644
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -1536,7 +1536,10 @@ search_struct_field (name, arg1, offset, type, looking_for_baseclass)
 	    return v;
 	  }
 
-	if (t_field_name && t_field_name[0] == '\0')
+	if (t_field_name
+	    && (t_field_name[0] == '\0'
+		|| (TYPE_CODE (type) == TYPE_CODE_UNION
+		    && STREQ (t_field_name, "else"))))
 	  {
 	    struct type *field_type = TYPE_FIELD_TYPE (type, i);
 	    if (TYPE_CODE (field_type) == TYPE_CODE_UNION