Merge pull request #1595 from take-cheeze/filename_realloc_fix

get_filename_table_size realloc fix.

3 files changed, 16 insertions, 1 deletions

diff --git a/src/dump.c b/src/dump.c
index 97c07afcd..6f6063500 100644
--- a/src/dump.c
+++ b/src/dump.c
@@ -492,6 +492,7 @@ get_filename_table_size(mrb_state *mrb, mrb_irep *irep, mrb_sym **fp, size_t *lp
     }
     for (i=0; i<irep->rlen; i++) {
       size += get_filename_table_size(mrb, irep->reps[i], fp, lp);
+      filenames = *fp;
     }
   }
   return size;
diff --git a/tasks/mruby_build.rake b/tasks/mruby_build.rake
index ff6110884..acaabfa81 100644
--- a/tasks/mruby_build.rake
+++ b/tasks/mruby_build.rake
@@ -87,6 +87,11 @@ module MRuby
       MRuby.targets[@name].instance_eval(&block)
     end
 
+    def enable_debug
+      compilers.each { |c| c.defines += %w(MRB_DEBUG) }
+      @mrbc.compile_options += ' -g'
+    end
+
     def toolchain(name)
       tc = Toolchain.toolchains[name.to_s]
       fail "Unknown #{name} toolchain" unless tc
diff --git a/travis_config.rb b/travis_config.rb
index 89aef9f55..360cf3337 100644
--- a/travis_config.rb
+++ b/travis_config.rb
@@ -1,7 +1,16 @@
+MRuby::Build.new('debug') do |conf|
+  toolchain :gcc
+  enable_debug
+
+  # include all core GEMs
+  conf.gembox 'full-core'
+  conf.cc.defines = %w(MRB_GC_FIXED_ARENA)
+end
+
 MRuby::Build.new do |conf|
   toolchain :gcc
 
   # include all core GEMs
   conf.gembox 'full-core'
-  conf.cc.defines = %w(MRB_DEBUG MRB_GC_FIXED_ARENA)
+  conf.cc.defines = %w(MRB_GC_FIXED_ARENA)
 end