Add end_psymtab_common, have all debug info readers call it.

[deliverable/binutils-gdb.git] / gdb / dwarf2loc.c

diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
index d81110684e02091372317221e83310807651c811..d8e432ed930469f56e605f3c8f0a05111400da97 100644 (file)
--- a/gdb/dwarf2loc.c
+++ b/gdb/dwarf2loc.c
@@ -39,7 +39,7 @@
 #include "dwarf2-frame.h"
 #include "compile/compile.h"
 
-extern int dwarf2_always_disassemble;
+extern int dwarf_always_disassemble;
 
 extern const struct dwarf_expr_context_funcs dwarf_expr_ctx_funcs;
 
@@ -825,9 +825,8 @@ chain_candidate (struct gdbarch *gdbarch, struct call_site_chain **resultp,
 
   /* See call_site_find_chain_1 why there is no way to reach the bottom callee
      PC again.  In such case there must be two different code paths to reach
-     it, therefore some of the former determined intermediate PCs must differ
-     and the unambiguous chain gets shortened.  */
-  gdb_assert (result->callers + result->callees < result->length);
+     it.  CALLERS + CALLEES equal to LENGTH in the case of self tail-call.  */
+  gdb_assert (result->callers + result->callees <= result->length);
 }
 
 /* Create and return call_site_chain for CALLER_PC and CALLEE_PC.  All the
@@ -2882,7 +2881,7 @@ dwarf2_compile_expr_to_ax (struct agent_expr *expr, struct axs_value *loc,
 
   while (op_ptr < op_end)
     {
-      enum dwarf_location_atom op = *op_ptr;
+      enum dwarf_location_atom op = (enum dwarf_location_atom) *op_ptr;
       uint64_t uoffset, reg;
       int64_t offset;
       int i;
@@ -3765,7 +3764,7 @@ disassemble_dwarf_expression (struct ui_file *stream,
         && (all
             || (data[0] != DW_OP_piece && data[0] != DW_OP_bit_piece)))
     {
-      enum dwarf_location_atom op = *data++;
+      enum dwarf_location_atom op = (enum dwarf_location_atom) *data++;
       uint64_t ul;
       int64_t l;
       const char *name;
@@ -4137,7 +4136,7 @@ locexpr_describe_location_1 (struct symbol *symbol, CORE_ADDR addr,
       else
        fprintf_filtered (stream, _(", and "));
 
-      if (!dwarf2_always_disassemble)
+      if (!dwarf_always_disassemble)
        {
          data = locexpr_describe_location_piece (symbol, stream,
                                                  addr, objfile, per_cu,
@@ -4156,7 +4155,7 @@ locexpr_describe_location_1 (struct symbol *symbol, CORE_ADDR addr,
                                               get_objfile_arch (objfile),
                                               addr_size, offset_size, data,
                                               data, end, 0,
-                                              dwarf2_always_disassemble,
+                                              dwarf_always_disassemble,
                                               per_cu);
        }