vm.c: disable dtrace in jit source

* vm.c: include dummy dtrace probes header in jit header. * vm_insnhelper.c: probes headers are included by vm.c. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62489 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
ruby · Feb 20, 2018 · 49f5293 · 49f5293
1 parent fe5d65f
commit 49f5293
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/eval.c b/eval.c
@@ -18,6 +18,7 @@
 #include "ruby/vm.h"
 #include "vm_core.h"
 #include "mjit.h"
+#include "probes.h"
 #include "probes_helper.h"
 
 NORETURN(void rb_raise_jump(VALUE, VALUE));

diff --git a/probes_helper.h b/probes_helper.h
@@ -2,7 +2,6 @@
 #define RUBY_PROBES_HELPER_H
 
 #include "ruby/ruby.h"
-#include "probes.h"
 
 struct ruby_dtrace_method_hook_args {
     const char *classname;

diff --git a/vm.c b/vm.c
@@ -17,7 +17,11 @@
 #include "vm_debug.h"
 #include "iseq.h"
 #include "eval_intern.h"
+#ifndef MJIT_HEADER
 #include "probes.h"
+#else
+#include "probes.dmyh"
+#endif
 #include "probes_helper.h"
 
 VALUE rb_str_concat_literals(size_t, const VALUE*);

diff --git a/vm_insnhelper.c b/vm_insnhelper.c
@@ -14,8 +14,6 @@
 #include <math.h>
 #include "constant.h"
 #include "internal.h"
-#include "probes.h"
-#include "probes_helper.h"
 #include "ruby/config.h"
 #include "debug_counter.h"