naruse	2019-01-13 06:04:31 +0900 (Sun, 13 Jan 2019)

  New Revision: 66800

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=66800

  Log:
    merge revision(s) 66768: [Backport #15519]
    
    Get rid of C99 feature for now [ruby-core:90949] [Bug #15519]

  Modified directories:
    branches/ruby_2_6/
  Modified files:
    branches/ruby_2_6/addr2line.c
    branches/ruby_2_6/version.h
Index: ruby_2_6/version.h
===================================================================
--- ruby_2_6/version.h	(revision 66799)
+++ ruby_2_6/version.h	(revision 66800)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_6/version.h#L1
 #define RUBY_VERSION "2.6.0"
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 6
+#define RUBY_PATCHLEVEL 7
 
 #define RUBY_RELEASE_YEAR 2019
 #define RUBY_RELEASE_MONTH 1
Index: ruby_2_6/addr2line.c
===================================================================
--- ruby_2_6/addr2line.c	(revision 66799)
+++ ruby_2_6/addr2line.c	(revision 66800)
@@ -1193,6 +1193,7 @@ debug_info_reader_read_value(DebugInfoRe https://github.com/ruby/ruby/blob/trunk/ruby_2_6/addr2line.c#L1193
 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, https://github.com/ruby/ruby/blob/trunk/ruby_2_6/addr2line.c#L1208
         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 *re https://github.com/ruby/ruby/blob/trunk/ruby_2_6/addr2line.c#L1507
 
 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, https://github.com/ruby/ruby/blob/trunk/ruby_2_6/addr2line.c#L1558
         }
         /* 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);
Index: ruby_2_6
===================================================================
--- ruby_2_6	(revision 66799)
+++ ruby_2_6	(revision 66800)

Property changes on: ruby_2_6
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r66768

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/