From 9553911f29dca2b485098c1c720d6e1cfb622ca9 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 19 May 2009 15:07:45 +0000
Subject: * vm_method.c (rb_attr): should preserve encoding info.  
 [ruby-dev:38498]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23491 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 vm_method.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'vm_method.c')

diff --git a/vm_method.c b/vm_method.c
index 25d2e6d0c3..f32ba388ac 100644
--- a/vm_method.c
+++ b/vm_method.c
@@ -446,6 +446,7 @@ rb_attr(VALUE klass, ID id, int read, int write, int ex)
 {
     const char *name;
     ID attriv;
+    VALUE aname;
     int noex;
 
     if (!ex) {
@@ -473,7 +474,9 @@ rb_attr(VALUE klass, ID id, int read, int write, int ex)
     if (!name) {
 	rb_raise(rb_eArgError, "argument needs to be symbol or string");
     }
-    attriv = rb_intern_str(rb_sprintf("@%s", name));
+    aname = rb_sprintf("@%s", name);
+    rb_enc_copy(aname, rb_id2str(id));
+    attriv = rb_intern_str(aname);
     if (read) {
 	rb_add_method(klass, id, NEW_IVAR(attriv), noex);
     }
-- 
cgit v1.2.1