gdb: defer commit resume until all available events are consumed

[deliverable/binutils-gdb.git] / gdb / c-varobj.c

diff --git a/gdb/c-varobj.c b/gdb/c-varobj.c
index 2be447a86609a1a82eeb743fd16b317907bab564..6cc76a1e7ac60c4e31571fdf1913ce74ac118bbd 100644 (file)
--- a/gdb/c-varobj.c
+++ b/gdb/c-varobj.c
@@ -307,12 +307,12 @@ c_describe_child (const struct varobj *parent, int index,
     case TYPE_CODE_ARRAY:
       if (cname)
        *cname = int_string (index
-                            + TYPE_LOW_BOUND (TYPE_INDEX_TYPE (type)),
+                            + TYPE_LOW_BOUND (type->index_type ()),
                             10, 1, 0, 0);
 
       if (cvalue && value)
        {
-         int real_index = index + TYPE_LOW_BOUND (TYPE_INDEX_TYPE (type));
+         int real_index = index + TYPE_LOW_BOUND (type->index_type ());
 
          try
            {
@@ -330,7 +330,7 @@ c_describe_child (const struct varobj *parent, int index,
        *cfull_expression = 
          string_printf ("(%s)[%s]", parent_expression.c_str (),
                         int_string (index
-                                    + TYPE_LOW_BOUND (TYPE_INDEX_TYPE (type)),
+                                    + TYPE_LOW_BOUND (type->index_type ()),
                                     10, 1, 0, 0));
 
 
@@ -348,7 +348,7 @@ c_describe_child (const struct varobj *parent, int index,
          {
            if (cname)
              {
-               if (TYPE_FIELD_TYPE (type, index)->code ()
+               if (type->field (index).type ()->code ()
                    == TYPE_CODE_STRUCT)
                  *cname = ANONYMOUS_STRUCT_NAME;
                else
@@ -380,7 +380,7 @@ c_describe_child (const struct varobj *parent, int index,
          }
 
        if (ctype)
-         *ctype = TYPE_FIELD_TYPE (type, index);
+         *ctype = type->field (index).type ();
       }
       break;
 
@@ -771,10 +771,10 @@ cplus_describe_child (const struct varobj *parent, int index,
            {
              if (cname)
                {
-                 if (TYPE_FIELD_TYPE (type, type_index)->code ()
+                 if (type->field (type_index).type ()->code ()
                      == TYPE_CODE_STRUCT)
                    *cname = ANONYMOUS_STRUCT_NAME;
-                 else if (TYPE_FIELD_TYPE (type, type_index)->code ()
+                 else if (type->field (type_index).type ()->code ()
                           == TYPE_CODE_UNION)
                    *cname = ANONYMOUS_UNION_NAME;
                }
@@ -797,7 +797,7 @@ cplus_describe_child (const struct varobj *parent, int index,
            *cvalue = value_struct_element_index (value, type_index);
 
          if (ctype)
-           *ctype = TYPE_FIELD_TYPE (type, type_index);
+           *ctype = type->field (type_index).type ();
        }
       else if (index < TYPE_N_BASECLASSES (type))
        {
@@ -806,11 +806,11 @@ cplus_describe_child (const struct varobj *parent, int index,
            *cname = TYPE_FIELD_NAME (type, index);
 
          if (cvalue && value)
-           *cvalue = value_cast (TYPE_FIELD_TYPE (type, index), value);
+           *cvalue = value_cast (type->field (index).type (), value);
 
          if (ctype)
            {
-             *ctype = TYPE_FIELD_TYPE (type, index);
+             *ctype = type->field (index).type ();
            }
 
          if (cfull_expression)