Fix latent bug with custom word point completers

[deliverable/binutils-gdb.git] / gdb / dwarf-index-cache.c

diff --git a/gdb/dwarf-index-cache.c b/gdb/dwarf-index-cache.c
index 41340b8d8de08114c9f7a3587805cb8066ed65de..7222f0528d7af82bd1d67ac763e2f42b4f9de92e 100644 (file)
--- a/gdb/dwarf-index-cache.c
+++ b/gdb/dwarf-index-cache.c
@@ -18,24 +18,19 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
+#include "dwarf-index-cache.h"
 
-/* Standard C includes.  */
-#include <stdlib.h>
-
-/* Standard C++ includes.  */
-#include <string>
-
-/* Local non-gdb includes.  */
 #include "build-id.h"
 #include "cli/cli-cmds.h"
 #include "command.h"
-#include "common/pathstuff.h"
 #include "common/scoped_mmap.h"
-#include "common/selftest.h"
-#include "dwarf-index-cache.h"
+#include "common/pathstuff.h"
 #include "dwarf-index-write.h"
 #include "dwarf2read.h"
 #include "objfiles.h"
+#include "common/selftest.h"
+#include <string>
+#include <stdlib.h>
 
 /* When set to 1, show debug messages about the index cache.  */
 static int debug_index_cache = 0;
@@ -115,12 +110,12 @@ index_cache::store (struct dwarf2_per_objfile *dwarf2_per_objfile)
 
   std::string build_id_str = build_id_to_string (build_id);
 
-  TRY
+  try
     {
       /* Try to create the containing directory.  */
       if (!mkdir_recursive (m_dir.c_str ()))
        {
-         warning (_("index cache: could not make cache directory: %s\n"),
+         warning (_("index cache: could not make cache directory: %s"),
                   safe_strerror (errno));
          return;
        }
@@ -134,13 +129,12 @@ index_cache::store (struct dwarf2_per_objfile *dwarf2_per_objfile)
       write_psymtabs_to_index (dwarf2_per_objfile, m_dir.c_str (),
                               build_id_str.c_str (), dw_index_kind::GDB_INDEX);
     }
-  CATCH (except, RETURN_MASK_ERROR)
+  catch (const gdb_exception_error &except)
     {
       if (debug_index_cache)
        printf_unfiltered ("index cache: couldn't store index cache for objfile "
-                        "%s: %s", objfile_name (obj), except.message);
+                          "%s: %s", objfile_name (obj), except.what ());
     }
-  END_CATCH
 }
 
 #if HAVE_SYS_MMAN_H
@@ -177,7 +171,7 @@ index_cache::lookup_gdb_index (const bfd_build_id *build_id,
   /* Compute where we would expect a gdb index file for this build id to be.  */
   std::string filename = make_index_filename (build_id, INDEX4_SUFFIX);
 
-  TRY
+  try
     {
       if (debug_index_cache)
         printf_unfiltered ("index cache: trying to read %s\n",
@@ -194,13 +188,12 @@ index_cache::lookup_gdb_index (const bfd_build_id *build_id,
          ((const gdb_byte *) mmap_resource->mapping.get (),
           mmap_resource->mapping.size ());
     }
-  CATCH (except, RETURN_MASK_ERROR)
+  catch (const gdb_exception_error &except)
     {
       if (debug_index_cache)
        printf_unfiltered ("index cache: couldn't read %s: %s\n",
-                        filename.c_str (), except.message);
+                          filename.c_str (), except.what ());
     }
-  END_CATCH
 
   return {};
 }