nobu	2018-02-20 12:15:33 +0900 (Tue, 20 Feb 2018)

  New Revision: 62489

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=62489

  Log:
    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.

  Modified files:
    trunk/eval.c
    trunk/probes_helper.h
    trunk/vm.c
    trunk/vm_insnhelper.c
Index: vm.c
===================================================================
--- vm.c	(revision 62488)
+++ vm.c	(revision 62489)
@@ -17,7 +17,11 @@ https://github.com/ruby/ruby/blob/trunk/vm.c#L17
 #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*);
Index: probes_helper.h
===================================================================
--- probes_helper.h	(revision 62488)
+++ probes_helper.h	(revision 62489)
@@ -2,7 +2,6 @@ https://github.com/ruby/ruby/blob/trunk/probes_helper.h#L2
 #define RUBY_PROBES_HELPER_H
 
 #include "ruby/ruby.h"
-#include "probes.h"
 
 struct ruby_dtrace_method_hook_args {
     const char *classname;
Index: eval.c
===================================================================
--- eval.c	(revision 62488)
+++ eval.c	(revision 62489)
@@ -18,6 +18,7 @@ https://github.com/ruby/ruby/blob/trunk/eval.c#L18
 #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));
Index: vm_insnhelper.c
===================================================================
--- vm_insnhelper.c	(revision 62488)
+++ vm_insnhelper.c	(revision 62489)
@@ -14,8 +14,6 @@ https://github.com/ruby/ruby/blob/trunk/vm_insnhelper.c#L14
 #include <math.h>
 #include "constant.h"
 #include "internal.h"
-#include "probes.h"
-#include "probes_helper.h"
 #include "ruby/config.h"
 #include "debug_counter.h"
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/