From: Doug Evans <dje@google.com>
Date: Mon, 26 Aug 2013 18:38:37 +0000 (+0000)
Subject: 	* dwarf2read.c (write_psymtabs_to_index): Move error checks ahead of
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=260b681b41cf3953ac2a2e5e3e6a4f690a75064d;p=deliverable%2Fbinutils-gdb.git

	* dwarf2read.c (write_psymtabs_to_index): Move error checks ahead of
	missing debug info checks.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 923fb89da0..91dc2d4aa2 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-26  Doug Evans  <dje@google.com>
+
+	* dwarf2read.c (write_psymtabs_to_index): Move error checks ahead of
+	missing debug info checks.
+
 2013-08-26  Raunaq Bathija  <raunaq12@in.ibm.com>
 	    Ulrich Weigand  <uweigand@de.ibm.com>
 
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 7891e32d75..d1ce9460ba 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -21263,15 +21263,15 @@ write_psymtabs_to_index (struct objfile *objfile, const char *dir)
   htab_t cu_index_htab;
   struct psymtab_cu_index_map *psymtab_cu_index_map;
 
-  if (!objfile->psymtabs || !objfile->psymtabs_addrmap)
-    return;
-
   if (dwarf2_per_objfile->using_index)
     error (_("Cannot use an index to create the index"));
 
   if (VEC_length (dwarf2_section_info_def, dwarf2_per_objfile->types) > 1)
     error (_("Cannot make an index when the file has multiple .debug_types sections"));
 
+  if (!objfile->psymtabs || !objfile->psymtabs_addrmap)
+    return;
+
   if (stat (objfile->name, &st) < 0)
     perror_with_name (objfile->name);