1 files changed, 2 insertions, 1 deletions
diff --git a/insns.def b/insns.def
index 32d6c9a873..6a5463710e 100644
--- a/insns.def
+++ b/insns.def
@@ -871,7 +871,8 @@ trace
                   rb_sourceline());
         }
     }
-    EXEC_EVENT_HOOK(th, flag, GET_SELF(), 0, 0 /* TODO: id, klass */);
+    EXEC_EVENT_HOOK(th, flag, GET_SELF(), 0, 0 /* id and klass are resolved at callee */,
+		    flag & RUBY_EVENT_RETURN ? TOPN(0) : Qundef);
 }
 
 /**********************************************************/