* vm_core.h: revisit the structure of frame, block and env.

  [Bug #12628]

  This patch introduce many changes.

  * Introduce concept of "Block Handler (BH)" to represent
    passed blocks.

  * move rb_control_frame_t::flag to ep[0] (as a special local
    variable). This flags represents not only frame type, but also
    env flags such as escaped.

  * rename `rb_block_t` to `struct rb_block`.

  * Make Proc, Binding and RubyVM::Env objects wb-protected.

  Check [Bug #12628] for more details.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55766 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 7 deletions

diff --git a/ruby.c b/ruby.c
index 4c1e7844bf..797fa79774 100644
--- a/ruby.c
+++ b/ruby.c
@@ -639,13 +639,10 @@ require_libraries(VALUE *req_list)
     *req_list = 0;
 }
 
-static rb_block_t*
+static const struct rb_block*
 toplevel_context(rb_binding_t *bind)
 {
-    rb_env_t *env;
-
-    GetEnvPtr(bind->env, env);
-    return &env->block;
+    return &bind->block;
 }
 
 static void
@@ -1447,7 +1444,7 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
     char fbuf[MAXPATHLEN];
     int i = (int)proc_options(argc, argv, opt, 0);
     rb_binding_t *toplevel_binding;
-    rb_block_t *base_block;
+    const struct rb_block *base_block;
 
     argc -= i;
     argv += i;
@@ -1700,7 +1697,7 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
 	    path = rb_realpath_internal(Qnil, opt->script_name, 1);
 	}
 	base_block = toplevel_context(toplevel_binding);
-	iseq = rb_iseq_new_main(tree, opt->script_name, path, base_block->iseq);
+	iseq = rb_iseq_new_main(tree, opt->script_name, path, vm_block_iseq(base_block));
     }
 
     if (opt->dump & DUMP_BIT(insns)) {