summaryrefslogtreecommitdiff
path: root/enum.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-07-18 13:16:37 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-07-18 13:16:37 +0000
commite23d1736797f9b7170c80a7470b8e5cecd308105 (patch)
treedecab29dec4623d153048c82c9f96c70ecd0ac6b /enum.c
parent7ebb63f0389c06e05e047b54fb3171b97f210a34 (diff)
revert r46859 and r46860
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
Diffstat (limited to 'enum.c')
-rw-r--r--enum.c35
1 files changed, 1 insertions, 34 deletions
diff --git a/enum.c b/enum.c
index 1703003..44a73d3 100644
--- a/enum.c
+++ b/enum.c
@@ -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;
}