usa	2013-02-22 14:42:27 +0900 (Fri, 22 Feb 2013)

  New Revision: 39379

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39379

  Log:
    merge revision(s) 32688,33309,33408,33864,35874,38012: [Backport #7832]
    
    * vm_method.c (rb_gc_mark_unlinked_live_method_entries): remove unused
      variables.
    * vm_insnhelper.c (vm_call_cfunc): suppress a warning.  note that
      `volatile type *var' doesn't make var itself volatile.
    
    * vm_insnhelper.c (vm_call_cfunc): remove useless hack.
    
    * regparse.c (onig_number_of_names): suppress a warning.
    
    * gc.c : remove a unused function.

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/gc.c
    branches/ruby_1_9_3/insns.def
    branches/ruby_1_9_3/regparse.c
    branches/ruby_1_9_3/version.h
    branches/ruby_1_9_3/vm_insnhelper.c
    branches/ruby_1_9_3/vm_method.c

Index: ruby_1_9_3/regparse.c
===================================================================
--- ruby_1_9_3/regparse.c	(revision 39378)
+++ ruby_1_9_3/regparse.c	(revision 39379)
@@ -579,7 +579,7 @@ onig_number_of_names(regex_t* reg) https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/regparse.c#L579
   NameTable* t = (NameTable* )reg->name_table;
 
   if (IS_NOT_NULL(t))
-    return t->num_entries;
+    return (int)t->num_entries;
   else
     return 0;
 }
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 39378)
+++ ruby_1_9_3/ChangeLog	(revision 39379)
@@ -1,3 +1,20 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Fri Feb 22 14:40:57 2013  Narihiro Nakamura  <authornari@g...>
+
+	* gc.c : remove a unused function.
+
+Fri Feb 22 14:40:57 2013  NARUSE, Yui  <naruse@r...>
+
+	* regparse.c (onig_number_of_names): suppress a warning.
+
+Fri Feb 22 14:40:57 2013  NARUSE, Yui  <naruse@r...>
+
+	* vm_insnhelper.c (vm_call_cfunc): remove useless hack.
+
+Fri Feb 22 14:40:57 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* vm_insnhelper.c (vm_call_cfunc): suppress a warning.  note that
+	  `volatile type *var' doesn't make var itself volatile.
+
 Fri Feb 22 14:28:17 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* eval_jump.c (rb_exec_end_proc): remember the latest exit status.
Index: ruby_1_9_3/insns.def
===================================================================
--- ruby_1_9_3/insns.def	(revision 39378)
+++ ruby_1_9_3/insns.def	(revision 39379)
@@ -631,7 +631,7 @@ pop https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/insns.def#L631
 (VALUE val)
 ()
 {
-    val = val;
+    (void)val;
     /* none */
 }
 
Index: ruby_1_9_3/vm_method.c
===================================================================
--- ruby_1_9_3/vm_method.c	(revision 39378)
+++ ruby_1_9_3/vm_method.c	(revision 39379)
@@ -99,7 +99,7 @@ void https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/vm_method.c#L99
 rb_gc_mark_unlinked_live_method_entries(void *pvm)
 {
     rb_vm_t *vm = pvm;
-    struct unlinked_method_entry_list_entry *ume = vm->unlinked_method_entry_list, *prev_ume = 0, *curr_ume;
+    struct unlinked_method_entry_list_entry *ume = vm->unlinked_method_entry_list;
 
     while (ume) {
 	if (ume->me->mark) {
Index: ruby_1_9_3/gc.c
===================================================================
--- ruby_1_9_3/gc.c	(revision 39378)
+++ ruby_1_9_3/gc.c	(revision 39379)
@@ -3056,21 +3056,6 @@ rb_gc_finalize_deferred(void) https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/gc.c#L3056
     finalize_deferred(&rb_objspace);
 }
 
-static int
-chain_finalized_object(st_data_t key, st_data_t val, st_data_t arg)
-{
-    RVALUE *p = (RVALUE *)key, **final_list = (RVALUE **)arg;
-    if ((p->as.basic.flags & (FL_FINALIZE|FL_MARK)) == FL_FINALIZE) {
-	if (BUILTIN_TYPE(p) != T_ZOMBIE) {
-	    p->as.free.flags = FL_MARK | T_ZOMBIE; /* remain marked */
-	    RDATA(p)->dfree = 0;
-	}
-	p->as.free.next = *final_list;
-	*final_list = p;
-    }
-    return ST_CONTINUE;
-}
-
 struct force_finalize_list {
     VALUE obj;
     VALUE table;
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 39378)
+++ ruby_1_9_3/version.h	(revision 39379)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 388
+#define RUBY_PATCHLEVEL 389
 
 #define RUBY_RELEASE_DATE "2013-02-22"
 #define RUBY_RELEASE_YEAR 2013
Index: ruby_1_9_3/vm_insnhelper.c
===================================================================
--- ruby_1_9_3/vm_insnhelper.c	(revision 39378)
+++ ruby_1_9_3/vm_insnhelper.c	(revision 39379)
@@ -406,10 +406,6 @@ vm_call_cfunc(rb_thread_t *th, rb_contro https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/vm_insnhelper.c#L406
     if (reg_cfp != th->cfp + 1) {
 	rb_bug("cfp consistency error - send");
     }
-#ifdef __llvm__
-#define RB_LLVM_GUARD(v) RB_GC_GUARD(v)
-    RB_LLVM_GUARD(reg_cfp);
-#endif
 
     vm_pop_frame(th);
 

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r32688,33309,33408,33864,35874,38012


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