object.c: preserve encodings

* object.c (rb_any_to_s, rb_obj_inspect): preserve encodings of class
  name and instance variable names.

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

1 files changed, 6 insertions, 5 deletions

diff --git a/object.c b/object.c
index 73f76fa753..d487fe82cc 100644
--- a/object.c
+++ b/object.c
@@ -370,10 +370,10 @@ rb_obj_init_dup_clone(VALUE obj, VALUE orig)
 VALUE
 rb_any_to_s(VALUE obj)
 {
-    const char *cname = rb_obj_classname(obj);
     VALUE str;
+    VALUE cname = rb_class_name(CLASS_OF(obj));
 
-    str = rb_sprintf("#<%s:%p>", cname, (void*)obj);
+    str = rb_sprintf("#<%"PRIsVALUE":%p>", cname, (void*)obj);
     OBJ_INFECT(str, obj);
 
     return str;
@@ -484,11 +484,12 @@ rb_obj_inspect(VALUE obj)
 {
     if (rb_ivar_count(obj) > 0) {
 	VALUE str;
-	const char *c = rb_obj_classname(obj);
+	VALUE c = rb_class_name(CLASS_OF(obj));
 
-	str = rb_sprintf("-<%s:%p", c, (void*)obj);
+	str = rb_sprintf("-<%"PRIsVALUE":%p", c, (void*)obj);
 	return rb_exec_recursive(inspect_obj, obj, str);
-    } else {
+    }
+    else {
 	return rb_any_to_s(obj);
     }
 }