Deopt if iseq trace events are enabled

tenderlove · tenderlove · commit ce8b9285fc04 · 2025-04-08T12:40:59.000-07:00
diff --git a/insns.def b/insns.def
@@ -915,7 +915,7 @@ opt_new
     VALUE argc = vm_ci_argc(cd->ci);
     VALUE val = TOPN(argc);
 
-    if (vm_method_cfunc_is(GET_ISEQ(), cd, val, rb_class_new_instance_pass_kw)) {
+    if (vm_method_cfunc_is(GET_ISEQ(), cd, val, rb_class_new_instance_pass_kw) && !(ruby_vm_event_flags & ISEQ_TRACE_EVENTS)) {
         RB_DEBUG_COUNTER_INC(opt_new_hit);
         val = rb_obj_alloc(val);
         TOPN(argc) = val;
diff --git a/test/ruby/test_settracefunc.rb b/test/ruby/test_settracefunc.rb
@@ -1999,7 +1999,7 @@ def m
     TracePoint.new(:c_call, &capture_events).enable{
       c.new
     }
-    assert_equal [:c_call, :itself, :initialize], events[0]
+    assert_equal [:c_call, :itself, :initialize], events[1]
     events.clear
 
     o = Class.new{

Original file line number	Diff line number	Diff line change
`@@ -1999,7 +1999,7 @@ def m`
`1999`	`1999`	`TracePoint.new(:c_call, &capture_events).enable{`
`2000`	`2000`	`c.new`
`2001`	`2001`	`}`
`2002`		`- assert_equal [:c_call, :itself, :initialize], events[0]`
	`2002`	`+ assert_equal [:c_call, :itself, :initialize], events[1]`
`2003`	`2003`	`events.clear`
`2004`	`2004`
`2005`	`2005`	`o = Class.new{`