1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert r62617 "compile.c: fix load_from_binary"

Browse Source 
It breaks Solaris:
http://rubyci.s3.amazonaws.com/unstable11s/ruby-trunk/log/20180301T012502Z.diff.html.gz

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62769 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2018-03-15 16:51:34 +00:00
parent 01b46043e4
commit 0129fc8f58
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compile.c
View File

@ -8773,8 +8773,7 @@ ibf_load_iseq_each(const struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t of
rb_raise(rb_eRuntimeError, "path object size mismatch"); rb_raise(rb_eRuntimeError, "path object size mismatch");
} }
path = rb_fstring(RARRAY_AREF(pathobj, 0)); path = rb_fstring(RARRAY_AREF(pathobj, 0));
realpath = RARRAY_AREF(pathobj, 1); realpath = rb_fstring(RARRAY_AREF(pathobj, 1));
if (!NIL_P(realpath)) realpath = rb_fstring(realpath);
} }
else { else {
rb_raise(rb_eRuntimeError, "unexpected path object"); rb_raise(rb_eRuntimeError, "unexpected path object");

9
test/ruby/test_iseq.rb
View File

@ -398,9 +398,10 @@ class TestISeq < Test::Unit::TestCase
def test_to_binary_with_objects def test_to_binary_with_objects
code = "[]"+100.times.map{|i|"<</#{i}/"}.join code = "[]"+100.times.map{|i|"<</#{i}/"}.join
iseq = RubyVM::InstructionSequence.compile(code) bin = assert_nothing_raised {
bin = assert_nothing_raised {iseq.to_binary} RubyVM::InstructionSequence.compile(code).to_binary
iseq2 = RubyVM::InstructionSequence.load_from_binary(bin) }
assert_equal(iseq2.to_a, iseq.to_a) # load_from_binary doesn't work now
assert_instance_of(String, bin)
end end
end end