1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* array.c (ary_ensure_room_for_push): use RARRAY_RAWPTR() instead of

Browse Source 
RARRAY_PTR. In this code, there are no "write" operation.
* array.c (rb_ary_equal): ditto.
* array.c (recursive_equal): ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42063 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2013-07-19 06:21:12 +00:00
parent 344835a754
commit b9b5a2ccab
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Fri Jul 19 15:19:37 2013 Koichi Sasada <ko1@atdot.net>
* array.c (ary_ensure_room_for_push): use RARRAY_RAWPTR() instead of
RARRAY_PTR. In this code, there are no "write" operation.
* array.c (rb_ary_equal): ditto.
* array.c (recursive_equal): ditto.
Fri Jul 19 15:09:22 2013 Koichi Sasada <ko1@atdot.net> Fri Jul 19 15:09:22 2013 Koichi Sasada <ko1@atdot.net>
* gc.c, internal.h (rb_gc_writebarrier_remember_promoted): add a new * gc.c, internal.h (rb_gc_writebarrier_remember_promoted): add a new

14
array.c
View File

@ -349,7 +349,7 @@ ary_ensure_room_for_push(VALUE ary, long add_len)
if (new_len > RARRAY_EMBED_LEN_MAX) { if (new_len > RARRAY_EMBED_LEN_MAX) {
VALUE shared = ARY_SHARED(ary); VALUE shared = ARY_SHARED(ary);
if (ARY_SHARED_NUM(shared) == 1) { if (ARY_SHARED_NUM(shared) == 1) {
if (RARRAY_PTR(ary) - RARRAY_PTR(shared) + new_len <= RARRAY_LEN(shared)) { if (RARRAY_RAWPTR(ary) - RARRAY_RAWPTR(shared) + new_len <= RARRAY_LEN(shared)) {
rb_ary_modify_check(ary); rb_ary_modify_check(ary);
} }
else { else {
@ -3584,12 +3584,12 @@ static VALUE
recursive_equal(VALUE ary1, VALUE ary2, int recur) recursive_equal(VALUE ary1, VALUE ary2, int recur)
{ {
long i, len1; long i, len1;
VALUE *p1, *p2; const VALUE *p1, *p2;
if (recur) return Qtrue; /* Subtle! */ if (recur) return Qtrue; /* Subtle! */
p1 = RARRAY_PTR(ary1); p1 = RARRAY_RAWPTR(ary1);
p2 = RARRAY_PTR(ary2); p2 = RARRAY_RAWPTR(ary2);
len1 = RARRAY_LEN(ary1); len1 = RARRAY_LEN(ary1);
for (i = 0; i < len1; i++) { for (i = 0; i < len1; i++) {
@ -3600,8 +3600,8 @@ recursive_equal(VALUE ary1, VALUE ary2, int recur)
return Qfalse; return Qfalse;
if (len1 < i) if (len1 < i)
return Qtrue; return Qtrue;
p1 = RARRAY_PTR(ary1) + i; p1 = RARRAY_RAWPTR(ary1) + i;
p2 = RARRAY_PTR(ary2) + i; p2 = RARRAY_RAWPTR(ary2) + i;
} }
else { else {
return Qfalse; return Qfalse;
@ -3638,7 +3638,7 @@ rb_ary_equal(VALUE ary1, VALUE ary2)
return rb_equal(ary2, ary1); return rb_equal(ary2, ary1);
} }
if (RARRAY_LEN(ary1) != RARRAY_LEN(ary2)) return Qfalse; if (RARRAY_LEN(ary1) != RARRAY_LEN(ary2)) return Qfalse;
if (RARRAY_PTR(ary1) == RARRAY_PTR(ary2)) return Qtrue; if (RARRAY_RAWPTR(ary1) == RARRAY_RAWPTR(ary2)) return Qtrue;
return rb_exec_recursive_paired(recursive_equal, ary1, ary2, ary2); return rb_exec_recursive_paired(recursive_equal, ary1, ary2, ary2);
} }