* test/ruby/test_basicinstructions.rb: updated for new class

  behavior.  [ruby-dev:32192]

* encoding.c (enc_name): Encoding should not rely on ENCODING in
  the FL_USERS flags.

* encoding.c (rb_enc_from_encoding): do not call rb_enc_associate
  for encoding itself.

* encoding.c (enc_register_at): ditto.

* marshal.c (r_ivar): do not set real instance variable for
  encoding data associated.

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

1 files changed, 3 insertions, 1 deletions

diff --git a/marshal.c b/marshal.c
index fdfa9868c5..c6b2d19838 100644
--- a/marshal.c
+++ b/marshal.c
@@ -1086,7 +1086,9 @@ r_ivar(VALUE obj, struct load_arg *arg)
 		int idx = rb_enc_find_index(StringValueCStr(val));
 		if (idx > 0) rb_enc_associate_index(obj, idx);
 	    }
-	    rb_ivar_set(obj, id, val);
+	    else {
+		rb_ivar_set(obj, id, val);
+	    }
 	}
     }
 }