2013-11-03
2013-11-03 16:59:19 by Henrik Grubbström (Grubba) <grubba@grubba.org>
-
e5b745a5dbe84f7f88d48e173505e0f5734afdcf
(5 lines)
(+3/-2)
[
Show
| Annotate
]
Branch: 7.9
Debug: Fixed bug in dump_program_tables().
The filename for inherited references was looked up in the wrong
program.
3369: Inside #if defined(PIKE_DEBUG)
for (d=0; d < p->num_identifier_references; d++) {
struct reference *ref = p->identifier_references + d;
struct identifier *id = ID_FROM_PTR(p, ref);
+ struct program *inh_p = INHERIT_FROM_PTR(p, ref)->prog;
fprintf(stderr,
"%*s %4d: %5x %7d %10d %s\n"
3378: Inside #if defined(PIKE_DEBUG)
ref->identifier_offset,
id->name->size_shift ? "(wide)" : id->name->str,
indent, "",
- p->num_strings?p->strings[id->filename_strno]->str:"-",
+ inh_p->num_strings?inh_p->strings[id->filename_strno]->str:"-",
(long)id->linenumber);
if (IDENTIFIER_IS_ALIAS(id->identifier_flags)) {
fprintf (stderr, "%*s Alias for %d:%d\n",
3391: Inside #if defined(PIKE_DEBUG)
indent, "", (long)id->func.offset);
} else if (IDENTIFIER_IS_PIKE_FUNCTION(id->identifier_flags)) {
INT_TYPE line;
- struct program *inh_p = INHERIT_FROM_PTR(p,ref)->prog;
+
struct pike_string *file =
get_line (ID_FROM_PTR(p,ref)->func.offset + inh_p->program, inh_p, &line);
if (!file->size_shift)