@@ -48,7 +48,6 @@ to_string (cooked_index_flag flags)
static constexpr cooked_index_flag::string_mapping mapping[] = {
MAP_ENUM_FLAG (IS_MAIN),
MAP_ENUM_FLAG (IS_STATIC),
- MAP_ENUM_FLAG (IS_ENUM_CLASS),
MAP_ENUM_FLAG (IS_LINKAGE),
MAP_ENUM_FLAG (IS_TYPE_DECLARATION),
};
@@ -56,13 +56,11 @@ enum cooked_index_flag_enum : unsigned char
IS_MAIN = 1,
/* True if this entry represents a "static" object. */
IS_STATIC = 2,
- /* True if this entry is an "enum class". */
- IS_ENUM_CLASS = 4,
/* True if this entry uses the linkage name. */
- IS_LINKAGE = 8,
+ IS_LINKAGE = 4,
/* True if this entry is just for the declaration of a type, not the
definition. */
- IS_TYPE_DECLARATION = 16,
+ IS_TYPE_DECLARATION = 8,
};
DEF_ENUM_FLAGS_TYPE (enum cooked_index_flag_enum, cooked_index_flag);
@@ -4517,6 +4517,7 @@ class cooked_indexer
sect_offset *sibling_offset,
const cooked_index_entry **parent_entry,
CORE_ADDR *maybe_defer,
+ bool *is_enum_class,
bool for_specification);
/* Handle DW_TAG_imported_unit, by scanning the DIE to find
@@ -16079,6 +16080,7 @@ cooked_indexer::scan_attributes (dwarf2_per_cu_data *scanning_per_cu,
sect_offset *sibling_offset,
const cooked_index_entry **parent_entry,
CORE_ADDR *maybe_defer,
+ bool *is_enum_class,
bool for_specification)
{
bool origin_is_dwz = false;
@@ -16162,7 +16164,7 @@ cooked_indexer::scan_attributes (dwarf2_per_cu_data *scanning_per_cu,
case DW_AT_enum_class:
if (attr.as_boolean ())
- *flags |= IS_ENUM_CLASS;
+ *is_enum_class = true;
break;
case DW_AT_low_pc:
@@ -16272,7 +16274,8 @@ cooked_indexer::scan_attributes (dwarf2_per_cu_data *scanning_per_cu,
else
scan_attributes (scanning_per_cu, new_reader, new_info_ptr,
new_info_ptr, new_abbrev, name, linkage_name,
- flags, nullptr, parent_entry, maybe_defer, true);
+ flags, nullptr, parent_entry, maybe_defer,
+ is_enum_class, true);
}
}
@@ -16424,10 +16427,11 @@ cooked_indexer::index_dies (cutu_reader *reader,
cooked_index_flag flags = IS_STATIC;
sect_offset sibling {};
const cooked_index_entry *this_parent_entry = parent_entry;
+ bool is_enum_class = false;
info_ptr = scan_attributes (reader->cu->per_cu, reader, info_ptr,
info_ptr, abbrev, &name, &linkage_name,
&flags, &sibling, &this_parent_entry,
- &defer, false);
+ &defer, &is_enum_class, false);
if (abbrev->tag == DW_TAG_namespace
&& m_language == language_cplus
@@ -16493,9 +16497,7 @@ cooked_indexer::index_dies (cutu_reader *reader,
"enum_class::enumerator"; otherwise we inject the
names into our own parent scope. */
info_ptr = recurse (reader, info_ptr,
- ((flags & IS_ENUM_CLASS) == 0)
- ? parent_entry
- : this_entry,
+ is_enum_class ? this_entry : parent_entry,
fully);
continue;