summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rw-r--r--hash.c18
2 files changed, 4 insertions, 26 deletions
diff --git a/ChangeLog b/ChangeLog
index c1e5c4d..ebce55f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,13 +5,6 @@ Sat Nov 16 00:18:36 2013 Masaki Matsushita <glass.saga@gmail.com>
* test/ruby/test_beginendblock.rb: test for above.
-Fri Nov 15 22:21:34 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * hash.c (hash_foreach_iter, hash_foreach_ensure, rb_hash_foreach):
- deal with iteration level when reentering by callcc. temporary
- measure until rollback of ensure is introduced. [ruby-dev:47807]
- [Bug #9105]
-
Fri Nov 15 17:07:31 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/delegate.rb (Delegator#send): override to get rid of global function interference.
@@ -45,10 +38,7 @@ Thu Nov 14 19:53:00 2013 Tanaka Akira <akr@fsij.org>
EVP_CIPHER_CTX_ctrl (and internally aes_gcm_ctrl) fail.
[ruby-core:55143] [Bug #8439] reported by Vit Ondruch.
-Thu Nov 14 11:35:37 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * hash.c (hash_foreach_ensure): restore iter_lev to the previous
- value, not just decrement. [ruby-dev:47803] [Bug #9105]
+Thu Nov 14 11:33:47 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* hash.c (foreach_safe_i, hash_foreach_iter): deal with error detected
by ST_CHECK.
diff --git a/hash.c b/hash.c
index d1816ff..a37318b 100644
--- a/hash.c
+++ b/hash.c
@@ -173,7 +173,6 @@ struct hash_foreach_arg {
VALUE hash;
rb_foreach_func *func;
VALUE arg;
- VALUE marker;
};
static int
@@ -189,10 +188,6 @@ hash_foreach_iter(st_data_t key, st_data_t value, st_data_t argp, int error)
if (RHASH(arg->hash)->ntbl != tbl) {
rb_raise(rb_eRuntimeError, "rehash occurred during iteration");
}
- if (DATA_PTR(arg->marker)) {
- RHASH_ITER_LEV(arg->hash)++;
- DATA_PTR(arg->marker) = 0;
- }
switch (status) {
case ST_DELETE:
FL_SET(arg->hash, HASH_DELETED);
@@ -206,14 +201,8 @@ hash_foreach_iter(st_data_t key, st_data_t value, st_data_t argp, int error)
}
static VALUE
-hash_foreach_ensure(VALUE arg)
+hash_foreach_ensure(VALUE hash)
{
- struct hash_foreach_arg *argp = (struct hash_foreach_arg *)arg;
- VALUE hash = argp->hash;
-
- if (DATA_PTR(argp->marker)) return 0;
- DATA_PTR(argp->marker) = (void *)-1;
-
if (--RHASH_ITER_LEV(hash) == 0) {
if (FL_TEST(hash, HASH_DELETED)) {
st_cleanup_safe(RHASH(hash)->ntbl, (st_data_t)Qundef);
@@ -240,12 +229,11 @@ rb_hash_foreach(VALUE hash, int (*func)(ANYARGS), VALUE farg)
if (!RHASH(hash)->ntbl)
return;
+ RHASH_ITER_LEV(hash)++;
arg.hash = hash;
arg.func = (rb_foreach_func *)func;
arg.arg = farg;
- arg.marker = Data_Wrap_Struct(0, 0, 0, 0);
- RHASH_ITER_LEV(hash)++;
- rb_ensure(hash_foreach_call, (VALUE)&arg, hash_foreach_ensure, (VALUE)&arg);
+ rb_ensure(hash_foreach_call, (VALUE)&arg, hash_foreach_ensure, hash);
}
static VALUE