kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

revert r46859 and r46860

Browse source 
revert "enum.c: optimize any? object allocations for Array and Hash"

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46865 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-07-18 13:16:37 +00:00
parent 7ebb63f038
commit e23d173679
5 changed files with 2 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -18,12 +18,6 @@ Fri Jul 18 17:41:54 2014 GoGo tanaka <qlli.illb@gmail.com>
* test/matrix/test_matrix.rb: Add tests for Matrix class.
[Feature #10057][ruby-core:63809]
Fri Jul 18 11:10:53 2014 Scott Francis <scott.francis@shopify.com>
* enum.c (enum_any): optimize object allocations for Array and
Hash when `each` is not redefined, always false if empty and the
case without a block. [fix GH-671]
Fri Jul 18 10:14:42 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* lib/fileutils.rb: added missing options of FileUtils.touch by @Domon.

2
common.mk
View file

@ -689,7 +689,7 @@ encoding.$(OBJEXT): {$(VPATH)}encoding.c $(RUBY_H_INCLUDES) \
$(ENCODING_H_INCLUDES) {$(VPATH)}regenc.h {$(VPATH)}util.h \
{$(VPATH)}internal.h
enum.$(OBJEXT): {$(VPATH)}enum.c $(RUBY_H_INCLUDES) {$(VPATH)}node.h \
{$(VPATH)}util.h {$(VPATH)}id.h {$(VPATH)}internal.h $(VM_CORE_H_INCLUDES)
{$(VPATH)}util.h {$(VPATH)}id.h {$(VPATH)}internal.h
enumerator.$(OBJEXT): {$(VPATH)}enumerator.c $(RUBY_H_INCLUDES) \
{$(VPATH)}internal.h {$(VPATH)}node.h
error.$(OBJEXT): {$(VPATH)}error.c {$(VPATH)}known_errors.inc \

35
enum.c
View file

@ -14,7 +14,6 @@
#include "node.h"
#include "id.h"
#include "internal.h"
#include "vm_core.h"
VALUE rb_f_send(int argc, VALUE *argv, VALUE recv);
@ -1024,11 +1023,6 @@ name##_iter_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memo)) \
static VALUE \
enum_##name##_func(VALUE result, NODE *memo)
#define ARY_OPTIMIZABLE_EACH(obj) \
(RBASIC_CLASS(obj) == rb_cArray && BASIC_OP_UNREDEFINED_P(BOP_EACH, ARRAY_REDEFINED_OP_FLAG))
#define HASH_OPTIMIZABLE_EACH(obj) \
(RBASIC_CLASS(obj) == rb_cHash && BASIC_OP_UNREDEFINED_P(BOP_EACH, HASH_REDEFINED_OP_FLAG))
DEFINE_ENUMFUNCS(all)
{
if (!RTEST(result)) {
@ -1092,34 +1086,7 @@ DEFINE_ENUMFUNCS(any)
static VALUE
enum_any(VALUE obj)
{
NODE *memo;
if (!SPECIAL_CONST_P(obj)) {
switch (BUILTIN_TYPE(obj)) {
case T_ARRAY:
if (ARY_OPTIMIZABLE_EACH(obj)) {
long i, len = RARRAY_LEN(obj);
if (!len) return Qfalse;
if (!rb_block_given_p()) {
const VALUE *ptr = RARRAY_CONST_PTR(obj);
for (i = 0; i < len; ++i) if (RTEST(ptr[i])) return Qtrue;
return Qfalse;
}
}
break;
case T_HASH:
if (HASH_OPTIMIZABLE_EACH(obj)) {
if (RHASH_EMPTY_P(obj)) return Qfalse;
if (!rb_block_given_p()) {
/* yields pairs, never false */
return Qtrue;
}
}
break;
}
}
memo = NEW_MEMO(Qfalse, 0, 0);
NODE *memo = NEW_MEMO(Qfalse, 0, 0);
rb_block_call(obj, id_each, 0, 0, ENUMFUNC(any), (VALUE)memo);
return memo->u1.value;
}

1
vm.c
View file

@ -1236,7 +1236,6 @@ vm_init_redefined_flag(void)
OP(Succ, SUCC), (C(Fixnum), C(String), C(Time));
OP(EqTilde, MATCH), (C(Regexp), C(String));
OP(Freeze, FREEZE), (C(String));
OP(Each, EACH), (C(Array), C(Hash));
#undef C
#undef OP
}

1
vm_core.h
View file

@ -341,7 +341,6 @@ enum ruby_basic_operators {
BOP_NEQ,
BOP_MATCH,
BOP_FREEZE,
BOP_EACH,
BOP_LAST_
};