* parse.y, compile.c, gc.c, insns.def, intern.h, iseq.c, node.h,

  object.c, string.c, variable.c, vm_macro.def: revert private
  instance variable feature, which is postponed until next major
  release.

* marshal.c: TYPE_SYMBOL2 removed; MARSHAL_MINOR reverted back to
  8th version.

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

1 files changed, 2 insertions, 11 deletions

diff --git a/insns.def b/insns.def
index 6acd86505b..022a6018e5 100644
--- a/insns.def
+++ b/insns.def
@@ -181,13 +181,10 @@ setdynamic
  */
 DEFINE_INSN
 getinstancevariable
-(ID id, num_t is_local)
+(ID id)
 ()
 (VALUE val)
 {
-    if (is_local) {
-	id = rb_compose_ivar2(id, eval_get_cvar_base(th, GET_ISEQ()));
-    }
     val = rb_ivar_get(GET_SELF(), id);
 }
 
@@ -200,13 +197,10 @@ getinstancevariable
  */
 DEFINE_INSN
 setinstancevariable
-(ID id, num_t is_local)
+(ID id)
 (VALUE val)
 ()
 {
-    if (is_local) {
-	id = rb_compose_ivar2(id, eval_get_cvar_base(th, GET_ISEQ()));
-    }
     rb_ivar_set(GET_SELF(), id, val);
 }
 
@@ -913,9 +907,6 @@ defined
 	break;
       case DEFINED_IVAR2:
 	klass = get_cref(GET_ISEQ(), GET_LFP())->nd_clss;
-	if (rb_ivar_defined(GET_SELF(), rb_compose_ivar2(SYM2ID(obj), klass))) {
-	    expr_type = "class local instance-variable";
-	}
 	break;
       case DEFINED_GVAR:
 	if (rb_gvar_defined((struct global_entry *)(obj & ~1))) {