kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 64514: [Backport #14702]

Browse source 
check trace flags at loading [Bug #14702]

	* iseq.c (iseq_init_trace): at ISeq loading time, we need to check
	  `ruby_vm_event_enabled_flags` to turn on trace instructions.
	  Seprate this checking code from `finish_iseq_build()` and make
	  new function. `iseq_ibf_load()` calls this funcation after loading.

	* test/ruby/test_iseq.rb: add a test for this fix.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@64997 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2018-10-11 14:20:25 +00:00
parent ea15ceddbe
commit c1034574aa
5 changed files with 28 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compile.c
View file

@ -9511,6 +9511,8 @@ iseq_ibf_load(VALUE str)
ibf_load_setup(load, loader_obj, str);
iseq = ibf_load_iseq(load, 0);
iseq_init_trace(iseq);
RB_GC_GUARD(loader_obj);
return iseq;
}

14
iseq.c
View file

@ -349,6 +349,15 @@ prepare_iseq_build(rb_iseq_t *iseq,
static void validate_get_insn_info(rb_iseq_t *iseq);
#endif
void
iseq_init_trace(rb_iseq_t *iseq)
{
iseq->aux.trace_events = 0;
if (ruby_vm_event_enabled_flags & ISEQ_TRACE_EVENTS) {
rb_iseq_trace_set(iseq, ruby_vm_event_enabled_flags & ISEQ_TRACE_EVENTS);
}
}
static VALUE
finish_iseq_build(rb_iseq_t *iseq)
{
@ -368,10 +377,7 @@ finish_iseq_build(rb_iseq_t *iseq)
rb_exc_raise(err);
}
iseq->aux.trace_events = 0;
if (ruby_vm_event_enabled_flags & ISEQ_TRACE_EVENTS) {
rb_iseq_trace_set(iseq, ruby_vm_event_enabled_flags & ISEQ_TRACE_EVENTS);
}
iseq_init_trace(iseq);
return Qtrue;
}

1
iseq.h
View file

@ -160,6 +160,7 @@ VALUE iseq_ibf_dump(const rb_iseq_t *iseq, VALUE opt);
void ibf_load_iseq_complete(rb_iseq_t *iseq);
const rb_iseq_t *iseq_ibf_load(VALUE str);
VALUE iseq_ibf_load_extra_data(VALUE str);
void iseq_init_trace(rb_iseq_t *iseq);
RUBY_SYMBOL_EXPORT_BEGIN

14
test/ruby/test_iseq.rb
View file

@ -390,4 +390,18 @@ class TestISeq < Test::Unit::TestCase
end
}
end
def test_to_binary_tracepoint
filename = "#{File.basename(__FILE__)}_#{__LINE__}"
iseq = RubyVM::InstructionSequence.compile("x = 1\n y = 2", filename)
iseq_bin = iseq.to_binary
ary = []
TracePoint.new(:line){|tp|
next unless tp.path == filename
ary << [tp.path, tp.lineno]
}.enable{
ISeq.load_from_binary(iseq_bin).eval
}
assert_equal [[filename, 1], [filename, 2]], ary, '[Bug #14702]'
end
end

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.5.2"
#define RUBY_RELEASE_DATE "2018-10-11"
#define RUBY_PATCHLEVEL 97
#define RUBY_PATCHLEVEL 98
#define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 10