From 0129fc8f58db1403dd987d2adecb35da85de2af3 Mon Sep 17 00:00:00 2001 From: naruse Date: Thu, 15 Mar 2018 16:51:34 +0000 Subject: [PATCH] Revert r62617 "compile.c: fix load_from_binary" 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 --- compile.c | 3 +-- test/ruby/test_iseq.rb | 9 +++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compile.c b/compile.c index 2c388b8a8c..17974b26c0 100644 --- a/compile.c +++ b/compile.c @@ -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"); } path = rb_fstring(RARRAY_AREF(pathobj, 0)); - realpath = RARRAY_AREF(pathobj, 1); - if (!NIL_P(realpath)) realpath = rb_fstring(realpath); + realpath = rb_fstring(RARRAY_AREF(pathobj, 1)); } else { rb_raise(rb_eRuntimeError, "unexpected path object"); diff --git a/test/ruby/test_iseq.rb b/test/ruby/test_iseq.rb index 1a45778cc4..4c811611ba 100644 --- a/test/ruby/test_iseq.rb +++ b/test/ruby/test_iseq.rb @@ -398,9 +398,10 @@ class TestISeq < Test::Unit::TestCase def test_to_binary_with_objects code = "[]"+100.times.map{|i|"<