From d3aa6514b455835220212298a4b189db28300c19 Mon Sep 17 00:00:00 2001 From: naruse Date: Sat, 12 Jan 2019 21:04:31 +0000 Subject: merge revision(s) 66768: [Backport #15519] Get rid of C99 feature for now [ruby-core:90949] [Bug #15519] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@66800 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- addr2line.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'addr2line.c') diff --git a/addr2line.c b/addr2line.c index a11d32b73d..b2c31b39ad 100644 --- a/addr2line.c +++ b/addr2line.c @@ -1193,6 +1193,7 @@ debug_info_reader_read_value(DebugInfoReader *reader, uint64_t form, DebugInfoVa static char * di_find_abbrev(DebugInfoReader *reader, uint64_t abbrev_number) { + uint64_t n; char *p; if (abbrev_number < ABBREV_TABLE_SIZE) { return reader->abbrev_table[abbrev_number]; @@ -1207,7 +1208,7 @@ di_find_abbrev(DebugInfoReader *reader, uint64_t abbrev_number) uint64_t form = uleb128(&p); if (!at && !form) break; } - for (uint64_t n = uleb128(&p); abbrev_number != n; n = uleb128(&p)) { + for (n = uleb128(&p); abbrev_number != n; n = uleb128(&p)) { if (n == 0) { fprintf(stderr,"%d: Abbrev Number %"PRId64" not found\n",__LINE__, abbrev_number); exit(1); @@ -1506,7 +1507,9 @@ read_abstract_origin(DebugInfoReader *reader, uint64_t abstract_origin, line_inf static void debug_info_read(DebugInfoReader *reader, int num_traces, void **traces, - line_info_t *lines, int offset) { + line_info_t *lines, int offset) +{ + int i; while (reader->p < reader->cu_end) { DIE die; ranges_t ranges = {}; @@ -1555,7 +1558,7 @@ debug_info_read(DebugInfoReader *reader, int num_traces, void **traces, } /* ranges_inspect(reader, &ranges); */ /* fprintf(stderr,"%d:%tx: %x ",__LINE__,diepos,die.tag); */ - for (int i=offset; i < num_traces; i++) { + for (i=offset; i < num_traces; i++) { uintptr_t addr = (uintptr_t)traces[i]; uintptr_t offset = addr - reader->obj->base_addr + reader->obj->vmaddr; uintptr_t saddr = ranges_include(reader, &ranges, offset); -- cgit v1.2.3