gdb/

	* eval.c (evaluate_struct_tuple): Skip static fields.
gdb/testsuite/
	* gdb.cp/bs15503.exp: Update comment for no longer crashing
	test.

1 files changed, 4 insertions, 0 deletions

diff --git a/gdb/eval.c b/gdb/eval.c
index 66776ea..083bbc2 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -283,6 +283,10 @@ evaluate_struct_tuple (struct value *struct_val,
 	      if (variantno < 0)
 		{
 		  fieldno++;
+		  /* Skip static fields.  */
+		  while (fieldno < TYPE_NFIELDS (struct_type)
+			 && TYPE_FIELD_STATIC_KIND (struct_type, fieldno))
+		    fieldno++;
 		  subfieldno = fieldno;
 		  if (fieldno >= TYPE_NFIELDS (struct_type))
 		    error (_("too many initializers"));