archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 32688,33309,33408,33864,35874,38012: [Backport #7832]

Browse source 
* 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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@39379 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2013-02-22 05:42:27 +00:00
parent 18488c1117
commit c8f2479c6b
7 changed files with 21 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

17
ChangeLog
View file

@ -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.

15
gc.c
View file

@ -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;

2
insns.def
View file

@ -631,7 +631,7 @@ pop
(VALUE val)
()
{
val = val;
(void)val;
/* none */
}

2
regparse.c
View file

@ -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;
}

2
version.h
View file

@ -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

4
vm_insnhelper.c
View file

@ -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);

2
vm_method.c
View file

@ -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) {