From 5b33223cb7b7d514bb8b0d31ed09a0ae14b8d7ce Mon Sep 17 00:00:00 2001 From: Dodji Seketeli Date: Fri, 20 Feb 2015 13:48:48 +0100 Subject: [PATCH] Simplify canonicalizing handling for typedefs * src/abg-dwarf-reader.cc (build_ir_node_from_die): For typedefs, we don't need to test that the current scope is a class to know that we are looking at a member type. Just looking at the is_member flag is enough. Signed-off-by: Dodji Seketeli --- src/abg-dwarf-reader.cc | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc index 4ae24b88..213f36d1 100644 --- a/src/abg-dwarf-reader.cc +++ b/src/abg-dwarf-reader.cc @@ -7149,13 +7149,10 @@ build_ir_node_from_die(read_context& ctxt, called_from_public_decl, where_offset); result = add_decl_to_scope(t, scope); - if (// t is not a member type - t && !is_member && !is_class_type(scope)) - { - maybe_canonicalize_type(dwarf_dieoffset(die), - die_is_from_alt_di, - ctxt); - } + if (t && !is_member) + maybe_canonicalize_type(dwarf_dieoffset(die), + die_is_from_alt_di, + ctxt); } break;