Fix style issues

	* include/abg-ir.h (struct ir_node_visitor): Fix the wording of
	the comment of this type.
	* src/abg-dwarf-reader.cc (build_ir_node_from_die): Fix the
	filling of the text of the comment of the code that chooses to
	perform early canonicalizing.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>

diff --git a/include/abg-ir.h b/include/abg-ir.h
index 86130c88491c3bfd53713986b003b3554646bc5b..39e093894aed2d3af0f765eaf55746be12b05bff 100644 (file)
--- a/include/abg-ir.h
+++ b/include/abg-ir.h
@@ -3369,11 +3369,14 @@ struct class_tdecl::shared_ptr_hash
 ///
 /// Client code willing to get notified for a certain kind of node
 /// during the IR traversal might want to define a visitor class that
-/// inherit ir_node_visitor, overload the ir_node_visitor::visit_begin
-/// or ir_node_visitor::visit_end method of its choice, and provide
-/// and implementation for it.  Note that inside these two methods,the
-/// node_visitor_base::visiting() method returns false.
-
+/// inherit ir_node_visitor, overload the ir_node_visitor::visit_begin()
+/// or ir_node_visitor::visit_end() method of its choice, and provide
+/// and implementation for it.  If either
+/// ir_node_visitor::visit_begin() or ir_node_visitor::visit_end()
+/// return false, it means the traversal has to stop immediately after
+/// the methods' return.  If the methods return true, it means the
+/// traversal keeps going.
+///
 /// That new visitor class would then be passed to e.g,
 /// translation_unit::traverse or to the traverse method of any type
 /// where the traversal is supposed to start from.

diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc
index 57cc6dfa97493d680a07e9e1d4d358bd1efb6817..c795f00d1292863d789ef6a073eeb6bac0eb3ff2 100644 (file)
--- a/src/abg-dwarf-reader.cc
+++ b/src/abg-dwarf-reader.cc
@@ -7584,16 +7584,16 @@ build_ir_node_from_die(read_context&    ctxt,
        if (// NOT be an incomplete type that is being currently
            // constructed.
            !ctxt.is_wip_class_die_offset(dwarf_dieoffset(die))
-           // And then do not early-canonicalize klass if it either:
-           && (// - has got virtual member functions.  This is because
-               //   the number of virtual member function might be
-               //   amended later, outside of the current DIE, by
-               //   cloned virtual functions that are clones of at
-               //   least one of the virtual functions declared in
-               //   the DIE.
+           // And not early-canonicalize klass if it either:
+           && (// - has got virtual member functions.  This is
+               //   because the number of virtual member function
+               //   might be amended later, outside of the current
+               //   DIE, by cloned virtual functions that are clones
+               //   of at least one of the virtual functions declared
+               //   in the DIE.
                !klass->has_virtual_member_functions()
-               // - or has got non-canonicalized sub types.  In that case
-               //   the non-canonicalized sub-type needs to be
+               // - or has got non-canonicalized sub types.  In that
+               //   case the non-canonicalized sub-type needs to be
                //   canonicalized before this type is.
                && !type_has_non_canonicalized_subtype(klass)))
          canonicalize(klass);