diff options
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | gc.c | 15 | ||||
| -rw-r--r-- | insns.def | 2 | ||||
| -rw-r--r-- | regparse.c | 2 | ||||
| -rw-r--r-- | version.h | 2 | ||||
| -rw-r--r-- | vm_insnhelper.c | 4 | ||||
| -rw-r--r-- | vm_method.c | 2 |
7 files changed, 21 insertions, 23 deletions
@@ -1,3 +1,20 @@ +Fri Feb 22 14:40:57 2013 Narihiro Nakamura <authornari@gmail.com> + + * gc.c : remove a unused function. + +Fri Feb 22 14:40:57 2013 NARUSE, Yui <naruse@ruby-lang.org> + + * regparse.c (onig_number_of_names): suppress a warning. + +Fri Feb 22 14:40:57 2013 NARUSE, Yui <naruse@ruby-lang.org> + + * vm_insnhelper.c (vm_call_cfunc): remove useless hack. + +Fri Feb 22 14:40:57 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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@ruby-lang.org> * eval_jump.c (rb_exec_end_proc): remember the latest exit status. @@ -3056,21 +3056,6 @@ rb_gc_finalize_deferred(void) 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; @@ -631,7 +631,7 @@ pop (VALUE val) () { - val = val; + (void)val; /* none */ } diff --git a/regparse.c b/regparse.c index 1369c86d41..40c4aa580e 100644 --- a/regparse.c +++ b/regparse.c @@ -579,7 +579,7 @@ onig_number_of_names(regex_t* reg) NameTable* t = (NameTable* )reg->name_table; if (IS_NOT_NULL(t)) - return t->num_entries; + return (int)t->num_entries; else return 0; } @@ -1,5 +1,5 @@ #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 diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 4f709e6291..5f7d1ee31b 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -406,10 +406,6 @@ vm_call_cfunc(rb_thread_t *th, rb_control_frame_t *reg_cfp, 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); diff --git a/vm_method.c b/vm_method.c index 6e336036e8..85cb30ca87 100644 --- a/vm_method.c +++ b/vm_method.c @@ -99,7 +99,7 @@ void 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) { |