aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Evans <dje@google.com>2013-08-26 18:38:37 +0000
committerDoug Evans <dje@google.com>2013-08-26 18:38:37 +0000
commit260b681b41cf3953ac2a2e5e3e6a4f690a75064d (patch)
treed13ca486a42abfc9ba61d9cff0246512b2d42e00
parent6e45f158982eeae2f9783d46e7d4903e245d5284 (diff)
downloadgdb-260b681b41cf3953ac2a2e5e3e6a4f690a75064d.zip
gdb-260b681b41cf3953ac2a2e5e3e6a4f690a75064d.tar.gz
gdb-260b681b41cf3953ac2a2e5e3e6a4f690a75064d.tar.bz2
* dwarf2read.c (write_psymtabs_to_index): Move error checks ahead of
missing debug info checks.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/dwarf2read.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 923fb89..91dc2d4 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 7891e32..d1ce946 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);