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

re.c (rb_reg_regcomp): remove volatile

Browse Source 
* re.c (rb_reg_regcomp): remove volatile
  Unnecessary since r13261

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44929 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
normal 2014-02-13 09:36:40 +00:00
parent dc853e330b
commit 9c4d2d79f3
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu Feb 13 18:28:51 2014 Eric Wong <e@80x24.org>
* re.c (rb_reg_regcomp): remove volatile
Unnecessary since r13261
Thu Feb 13 16:54:32 2014 Zachary Scott <e@zzak.io> Thu Feb 13 16:54:32 2014 Zachary Scott <e@zzak.io>
* test/ruby/test_array.rb: Ensure flatten! is used for test_flatten * test/ruby/test_array.rb: Ensure flatten! is used for test_flatten

3
re.c
View File

@ -2569,13 +2569,12 @@ static VALUE reg_cache;
VALUE VALUE
rb_reg_regcomp(VALUE str) rb_reg_regcomp(VALUE str)
{ {
volatile VALUE save_str = str;
if (reg_cache && RREGEXP_SRC_LEN(reg_cache) == RSTRING_LEN(str) if (reg_cache && RREGEXP_SRC_LEN(reg_cache) == RSTRING_LEN(str)
&& ENCODING_GET(reg_cache) == ENCODING_GET(str) && ENCODING_GET(reg_cache) == ENCODING_GET(str)
&& memcmp(RREGEXP_SRC_PTR(reg_cache), RSTRING_PTR(str), RSTRING_LEN(str)) == 0) && memcmp(RREGEXP_SRC_PTR(reg_cache), RSTRING_PTR(str), RSTRING_LEN(str)) == 0)
return reg_cache; return reg_cache;
return reg_cache = rb_reg_new_str(save_str, 0); return reg_cache = rb_reg_new_str(str, 0);
} }
static st_index_t reg_hash(VALUE re); static st_index_t reg_hash(VALUE re);