iseq.c: preserve encoding at disassembling

* iseq.c (rb_insn_operand_intern): preserve encoding of method
  name in CALL_INFO at disassembling.

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

1 files changed, 7 insertions, 6 deletions

diff --git a/test/ruby/test_iseq.rb b/test/ruby/test_iseq.rb
index 79c41bb900..d7d15c7703 100644
--- a/test/ruby/test_iseq.rb
+++ b/test/ruby/test_iseq.rb
@@ -52,13 +52,14 @@ class TestISeq < Test::Unit::TestCase
   end if defined?(RubyVM::InstructionSequence.load)
 
   def test_disasm_encoding
-    src = "\u{3042} = 1; \u{3042}"
-    enc, Encoding.default_internal = Encoding.default_internal, src.encoding
-    assert_equal(src.encoding, RubyVM::InstructionSequence.compile(src).disasm.encoding)
+    src = "\u{3042} = 1; \u{3042}; \u{3043}"
+    asm = RubyVM::InstructionSequence.compile(src).disasm
+    assert_equal(src.encoding, asm.encoding)
+    assert_predicate(asm, :valid_encoding?)
     src.encode!(Encoding::Shift_JIS)
-    assert_equal(true, RubyVM::InstructionSequence.compile(src).disasm.ascii_only?)
-  ensure
-    Encoding.default_internal = enc
+    asm = RubyVM::InstructionSequence.compile(src).disasm
+    assert_equal(src.encoding, asm.encoding)
+    assert_predicate(asm, :valid_encoding?)
   end
 
   LINE_BEFORE_METHOD = __LINE__