From 62fecbe8c54d8e59f45e06bb021ae3639efb0e5f Mon Sep 17 00:00:00 2001
From: ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 21 Jul 2015 22:52:59 +0000
Subject: * make rb_iseq_t T_IMEMO object (type is imemo_iseq).   All contents
 of previous rb_iseq_t is in rb_iseq_t::body.   Remove rb_iseq_t::self because
 rb_iseq_t is an object.   RubyVM::InstructionSequence is wrapper object
 points T_IMEMO/iseq.   So RubyVM::ISeq.of(something) method returns different
 wrapper   objects but they point the same T_IMEMO/iseq object.   This patch
 is big, but most of difference is replacement of   iseq->xxx to
 iseq->body->xxx.   (previous) rb_iseq_t::compile_data is also located to  
 rb_iseq_t::compile_data.   It was moved from rb_iseq_body::compile_data.  
 Now rb_iseq_t has empty two pointers.   I will split rb_iseq_body data into
 static data and dynamic data. * compile.c: rename some functions/macros.  
 Now, we don't need to separate iseq and iseqval (only VALUE). * eval.c
 (ruby_exec_internal): `n' is rb_iseq_t (T_IMEMO/iseq). *
 ext/objspace/objspace.c (count_imemo_objects): count T_IMEMO/iseq. * gc.c:
 check T_IMEMO/iseq. * internal.h: add imemo_type::imemo_iseq. * iseq.c:
 define RubyVM::InstructionSequnce as T_OBJECT.   Methods are implemented by
 functions named iseqw_.... * load.c (rb_load_internal0): rb_iseq_new_top()
 returns   rb_iseq_t (T_IMEMO/iesq). * method.h (rb_add_method_iseq): accept
 rb_iseq_t (T_IMEMO/iseq). * vm_core.h (GetISeqPtr): removed because it is not
 T_DATA now. * vm_core.h (struct rb_iseq_body): remove padding for   [Bug
 #10037][ruby-core:63721].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51327 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 insns.def | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'insns.def')

diff --git a/insns.def b/insns.def
index c2697c60d5..ed02b6edba 100644
--- a/insns.def
+++ b/insns.def
@@ -337,7 +337,7 @@ putiseq
 ()
 (VALUE ret)
 {
-    ret = iseq->self;
+    ret = (VALUE)iseq;
 }
 
 /**
@@ -917,8 +917,8 @@ defineclass
     vm_push_frame(th, class_iseq, VM_FRAME_MAGIC_CLASS, klass,
 		  VM_ENVVAL_BLOCK_PTR(GET_BLOCK_PTR()),
 		  (VALUE)vm_cref_push(th, klass, NULL),
-		  class_iseq->iseq_encoded, GET_SP(),
-		  class_iseq->local_size, class_iseq->stack_max);
+		  class_iseq->body->iseq_encoded, GET_SP(),
+		  class_iseq->body->local_size, class_iseq->body->stack_max);
 
     RESTORE_REGS();
     NEXT_INSN();
-- 
cgit v1.2.3

