[profiler] Split method_leave callback into a method_tail_call callback.

[mono.git] / mono / mini / interp / interp.c

diff --git a/mono/mini/interp/interp.c b/mono/mini/interp/interp.c
index fdbbe262ba4f2bb6d3e0fb1b6617b0a84511abdf..f09df220599504afa287a8721f1038197b05da23 100644 (file)
--- a/mono/mini/interp/interp.c
+++ b/mono/mini/interp/interp.c
@@ -2436,6 +2436,10 @@ ves_exec_method_with_context (InterpFrame *frame, ThreadContext *context, unsign
                }
                MINT_IN_CASE(MINT_JMP) {
                        InterpMethod *new_method = rtm->data_items [* (guint16 *)(ip + 1)];
+
+                       if (frame->imethod->prof_flags & MONO_PROFILER_CALL_INSTRUMENTATION_TAIL_CALL)
+                               MONO_PROFILER_RAISE (method_tail_call, (frame->imethod->method, new_method->method));
+
                        if (!new_method->transformed) {
                                frame->ip = ip;
                                frame->ex = mono_interp_transform_method (new_method, context);
@@ -4769,7 +4773,7 @@ array_constructed:
                        if (MONO_PROFILER_ENABLED (method_enter)) {
                                MonoProfilerCallContext *prof_ctx = NULL;
 
-                               if (frame->imethod->prof_flags & MONO_PROFILER_CALL_INSTRUMENTATION_PROLOGUE_CONTEXT) {
+                               if (frame->imethod->prof_flags & MONO_PROFILER_CALL_INSTRUMENTATION_ENTER_CONTEXT) {
                                        prof_ctx = g_new0 (MonoProfilerCallContext, 1);
                                        prof_ctx->interp_frame = frame;
                                        prof_ctx->method = frame->imethod->method;
@@ -5140,35 +5144,34 @@ die_on_ex:
        }
 exit_frame:
 
-       if (!frame->ex) {
-               if (MONO_PROFILER_ENABLED (method_leave) && frame->imethod->prof_flags & MONO_PROFILER_CALL_INSTRUMENTATION_EPILOGUE) {
-                       MonoProfilerCallContext *prof_ctx = NULL;
-
-                       if (frame->imethod->prof_flags & MONO_PROFILER_CALL_INSTRUMENTATION_EPILOGUE_CONTEXT) {
-                               prof_ctx = g_new0 (MonoProfilerCallContext, 1);
-                               prof_ctx->interp_frame = frame;
-                               prof_ctx->method = frame->imethod->method;
-
-                               MonoType *rtype = mono_method_signature (frame->imethod->method)->ret;
-
-                               switch (rtype->type) {
-                               case MONO_TYPE_VOID:
-                                       break;
-                               case MONO_TYPE_VALUETYPE:
-                                       prof_ctx->return_value = frame->retval->data.p;
-                                       break;
-                               default:
-                                       prof_ctx->return_value = frame->retval;
-                                       break;
-                               }
-                       }
+       if (!frame->ex && MONO_PROFILER_ENABLED (method_leave) &&
+           frame->imethod->prof_flags & MONO_PROFILER_CALL_INSTRUMENTATION_LEAVE) {
+               MonoProfilerCallContext *prof_ctx = NULL;
 
-                       MONO_PROFILER_RAISE (method_leave, (frame->imethod->method, prof_ctx));
+               if (frame->imethod->prof_flags & MONO_PROFILER_CALL_INSTRUMENTATION_LEAVE_CONTEXT) {
+                       prof_ctx = g_new0 (MonoProfilerCallContext, 1);
+                       prof_ctx->interp_frame = frame;
+                       prof_ctx->method = frame->imethod->method;
 
-                       g_free (prof_ctx);
+                       MonoType *rtype = mono_method_signature (frame->imethod->method)->ret;
+
+                       switch (rtype->type) {
+                       case MONO_TYPE_VOID:
+                               break;
+                       case MONO_TYPE_VALUETYPE:
+                               prof_ctx->return_value = frame->retval->data.p;
+                               break;
+                       default:
+                               prof_ctx->return_value = frame->retval;
+                               break;
+                       }
                }
-       } else
-               MONO_PROFILER_RAISE (method_exception_leave, (frame->imethod->method, (MonoObject *) frame->ex));
+
+               MONO_PROFILER_RAISE (method_leave, (frame->imethod->method, prof_ctx));
+
+               g_free (prof_ctx);
+       } else if (frame->ex && frame->imethod->prof_flags & MONO_PROFILER_CALL_INSTRUMENTATION_EXCEPTION_LEAVE)
+               MONO_PROFILER_RAISE (method_exception_leave, (frame->imethod->method, &frame->ex->object));
 
        DEBUG_LEAVE ();
 }