Confusion in coff_object_cleanup

[Alan Modra]

A bfd_cleanup function needs to run when only tdata is correct for the
bfd.  The xvec may have changed during bfd_check_format and thus the
flavour may be incorrect.  The format won't have changed but checking
is superfluous.  (In contrast to _bfd_free_cached_info or
_close_and_cleanup where we do need to check things.)

Not getting this correct leaked comdat_hash.

Also, pe_ILF_cleanup ought to call coff_object_cleanup as do all PE
files.

	* coffgen.c (coff_object_cleanup): Don't check bfd flavour or
	format.
	* peicode.h (pe_ILF_cleanup): Call coff_object_cleanup.

diff --git a/bfd/coffgen.c b/bfd/coffgen.c
index bf9633a2b33..91667267cbc 100644
--- a/bfd/coffgen.c
+++ b/bfd/coffgen.c
@@ -284,18 +284,15 @@ make_a_section_from_file (bfd *abfd,
 void
 coff_object_cleanup (bfd *abfd)
 {
-  if (bfd_family_coff (abfd) && bfd_get_format (abfd) == bfd_object)
+  struct coff_tdata *td = coff_data (abfd);
+  if (td != NULL)
     {
-      struct coff_tdata *td = coff_data (abfd);
-      if (td != NULL)
-	{
-	  if (td->section_by_index)
-	    htab_delete (td->section_by_index);
-	  if (td->section_by_target_index)
-	    htab_delete (td->section_by_target_index);
-	  if (obj_pe (abfd) && pe_data (abfd)->comdat_hash)
-	    htab_delete (pe_data (abfd)->comdat_hash);
-	}
+      if (td->section_by_index)
+	htab_delete (td->section_by_index);
+      if (td->section_by_target_index)
+	htab_delete (td->section_by_target_index);
+      if (obj_pe (abfd) && pe_data (abfd)->comdat_hash)
+	htab_delete (pe_data (abfd)->comdat_hash);
     }
 }
 
diff --git a/bfd/peicode.h b/bfd/peicode.h
index 5ac6b0dc53f..e1d06606575 100644
--- a/bfd/peicode.h
+++ b/bfd/peicode.h
@@ -1180,6 +1180,8 @@ pe_ILF_build_a_bfd (bfd *	    abfd,
 static void
 pe_ILF_cleanup (bfd *abfd)
 {
+  coff_object_cleanup (abfd);
+
   struct bfd_in_memory *bim = abfd->iostream;
   free (bim->buffer);
   free (bim);

-- 
Alan Modra
Australia Development Lab, IBM