updated patches for 2.1-head

skaes · Jul 31, 2014 · 13d535b · 13d535b
1 parent 44dd746
commit 13d535b
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 289 deletions.
diff --git a/patches/ruby/2.1/head/railsexpress/02-improve-gc-stats.patch b/patches/ruby/2.1/head/railsexpress/02-improve-gc-stats.patch
@@ -1,5 +1,5 @@
 diff --git a/gc.c b/gc.c
-index 7812d92..b9ad92b 100644
+index 76b8eb9..15558a2 100644
 --- a/gc.c
 +++ b/gc.c
 @@ -450,6 +450,8 @@ typedef struct rb_objspace {
@@ -373,7 +373,7 @@ index 7812d92..b9ad92b 100644
 
      gc_constants = rb_hash_new();
 diff --git a/include/ruby/intern.h b/include/ruby/intern.h
-index 6200e77..eb19662 100644
+index 46af270..4bbf0e8 100644
 --- a/include/ruby/intern.h
 +++ b/include/ruby/intern.h
 @@ -481,6 +481,9 @@ void rb_gc_finalize_deferred(void);

diff --git a/patches/ruby/2.1/head/railsexpress/04-show-full-backtrace-on-stack-overflow.patch b/patches/ruby/2.1/head/railsexpress/04-show-full-backtrace-on-stack-overflow.patch
@@ -1,5 +1,5 @@
 diff --git a/eval.c b/eval.c
-index 841b367..6878e14 100644
+index e58496e..e6a7c85 100644
 --- a/eval.c
 +++ b/eval.c
 @@ -482,8 +482,7 @@ setup_exception(rb_thread_t *th, int tag, volatile VALUE mesg)

diff --git a/patches/ruby/2.1/head/railsexpress/05-fix-missing-c-return-event.patch b/patches/ruby/2.1/head/railsexpress/05-fix-missing-c-return-event.patch
diff --git a/...express/07-funny-falcon-stc-density.patch → ...express/05-funny-falcon-stc-density.patch b/...express/07-funny-falcon-stc-density.patch → ...express/05-funny-falcon-stc-density.patch
@@ -1,5 +1,5 @@
 diff --git a/st.c b/st.c
-index 2335fdd..a5995fb 100644
+index d689c81..6f5e8be 100644
 --- a/st.c
 +++ b/st.c
 @@ -32,10 +32,10 @@ typedef struct st_packed_entry {

diff --git a/...hes/ruby/2.1/head/railsexpress/06-backport-006e66b6680f60adfb434ee7397f0dbc77de7873.patch b/...hes/ruby/2.1/head/railsexpress/06-backport-006e66b6680f60adfb434ee7397f0dbc77de7873.patch
diff --git a/...08-funny-falcon-stc-pool-allocation.patch → ...06-funny-falcon-stc-pool-allocation.patch b/...08-funny-falcon-stc-pool-allocation.patch → ...06-funny-falcon-stc-pool-allocation.patch
@@ -22,7 +22,7 @@ index 0c8b7fc..f993596 100644
    {$(VPATH)}timev.h $(ENCODING_H_INCLUDES)
  string.$(OBJEXT): {$(VPATH)}string.c $(RUBY_H_INCLUDES) {$(VPATH)}re.h \
 diff --git a/gc.c b/gc.c
-index b9ad92b..e7da770 100644
+index 15558a2..c30bd0d 100644
 --- a/gc.c
 +++ b/gc.c
 @@ -22,6 +22,7 @@
@@ -316,7 +316,7 @@ index 0000000..e2ec99a
 +}
 +#endif
 diff --git a/st.c b/st.c
-index a5995fb..756f258 100644
+index 6f5e8be..37d0ebe 100644
 --- a/st.c
 +++ b/st.c
 @@ -7,6 +7,7 @@

diff --git a/...lsexpress/09-aman-opt-aset-aref-str.patch → ...lsexpress/07-aman-opt-aset-aref-str.patch b/...lsexpress/09-aman-opt-aset-aref-str.patch → ...lsexpress/07-aman-opt-aset-aref-str.patch
@@ -1,8 +1,8 @@
 diff --git a/compile.c b/compile.c
-index e96a982..a8dd669 100644
+index a76c93b..641b41b 100644
 --- a/compile.c
 +++ b/compile.c
-@@ -4330,6 +4330,23 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
+@@ -4331,6 +4331,23 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
  	    }
  	    break;
  	}
@@ -26,7 +26,7 @@ index e96a982..a8dd669 100644
        case NODE_FCALL:
        case NODE_VCALL:{		/* VCALL: variable or call */
  	/*
-@@ -5300,6 +5317,25 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
+@@ -5301,6 +5318,25 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
  	VALUE flag = 0;
  	VALUE argc;
 
@@ -118,7 +118,7 @@ index ad4bba6..616838d 100644
    @j 最適化された recv.length()。
   */
 diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb
-index 0bbdf13..cbe55cc 100644
+index 59000ad..d811598 100644
 --- a/test/ruby/test_hash.rb
 +++ b/test/ruby/test_hash.rb
 @@ -215,6 +215,13 @@ class TestHash < Test::Unit::TestCase