From 970944847455dae54072ade11b4f4247e4707681 Mon Sep 17 00:00:00 2001
From: tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 29 Nov 2012 17:55:54 +0000
Subject: * vm.c: add a return hook when a method raises an exception.

* probes_helper.h: look up klass and method if none are provided.

* eval.c: update macro usage.

* vm_eval.c: ditto.

* vm_insnhelper.c: ditto.

* test/dtrace/test_function_entry.rb: test for change.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38001 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 probes_helper.h | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'probes_helper.h')

diff --git a/probes_helper.h b/probes_helper.h
index c8d8c9840b..7f4beb944f 100644
--- a/probes_helper.h
+++ b/probes_helper.h
@@ -18,11 +18,19 @@
 	} \
     } \
 
-#define RUBY_DTRACE_METHOD_RETURN_HOOK(klass, id) \
+#define RUBY_DTRACE_METHOD_RETURN_HOOK(th, klass, id) \
     if (RUBY_DTRACE_METHOD_RETURN_ENABLED()) { \
-	const char * classname  = rb_class2name((klass)); \
-	const char * methodname = rb_id2name((id)); \
-	const char * filename   = rb_sourcefile(); \
+	VALUE _klass = (klass); \
+	VALUE _id = (id); \
+	const char * classname; \
+	const char * methodname; \
+	const char * filename; \
+	if (!_klass) { \
+	    rb_thread_method_id_and_class((th), &_id, &_klass); \
+	} \
+	classname  = rb_class2name(_klass); \
+	methodname = rb_id2name(_id); \
+	filename   = rb_sourcefile(); \
 	if (classname && methodname && filename) { \
 	    RUBY_DTRACE_METHOD_RETURN( \
 		    classname, \
-- 
cgit v1.2.3