diff options
author | Koichi Sasada <ko1@atdot.net> | 2020-01-06 11:36:51 +0900 |
---|---|---|
committer | Koichi Sasada <ko1@atdot.net> | 2020-01-06 11:36:51 +0900 |
commit | ce072fe5689184cba5e4a86968367c525cb22a72 (patch) | |
tree | 3f9cabe287445791e67e4dd2b85625c07e60ea9e | |
parent | 46845d03c20bf7d157a040762f33a8d2fb2c3de8 (diff) | |
download | ruby-ce072fe5689184cba5e4a86968367c525cb22a72.tar.gz |
script_compiled event on compile error.
script_compiled event for TracePoint should not be invoked on
compile error (SyntaxError) because it is not "compiled".
[Bug #16459]
-rw-r--r-- | test/ruby/test_settracefunc.rb | 9 | ||||
-rw-r--r-- | vm_eval.c | 14 |
2 files changed, 17 insertions, 6 deletions
diff --git a/test/ruby/test_settracefunc.rb b/test/ruby/test_settracefunc.rb index 316e14e1ef..ada7b7596a 100644 --- a/test/ruby/test_settracefunc.rb +++ b/test/ruby/test_settracefunc.rb @@ -2188,10 +2188,19 @@ class TestSetTraceFunc < Test::Unit::TestCase [__FILE__+"/instance_eval", eval_script], [__FILE__+"/class_eval", eval_script], ], events + events.clear + tp.enable{ + begin + eval('a=') + rescue SyntaxError + end + } + assert_equal [], events, 'script_compiled event should not be invoked on compile error' skip "TODO: test for requires" + events.clear tp.enable{ require '' require_relative '' @@ -1486,7 +1486,7 @@ eval_make_iseq(VALUE src, VALUE fname, int line, const rb_binding_t *bind, const VALUE parser = rb_parser_new(); const rb_iseq_t *const parent = vm_block_iseq(base_block); VALUE realpath = Qnil; - rb_iseq_t *iseq = 0; + rb_iseq_t *iseq = NULL; rb_ast_t *ast; if (!fname) { @@ -1511,12 +1511,14 @@ eval_make_iseq(VALUE src, VALUE fname, int line, const rb_binding_t *bind, } rb_ast_dispose(ast); - if (0 && iseq) { /* for debug */ - VALUE disasm = rb_iseq_disasm(iseq); - printf("%s\n", StringValuePtr(disasm)); - } + if (iseq != NULL) { + if (0 && iseq) { /* for debug */ + VALUE disasm = rb_iseq_disasm(iseq); + printf("%s\n", StringValuePtr(disasm)); + } - rb_exec_event_hook_script_compiled(GET_EC(), iseq, src); + rb_exec_event_hook_script_compiled(GET_EC(), iseq, src); + } return iseq; } |