From f8eaf3c625e7a57509d74ce26a82593698fafad0 Mon Sep 17 00:00:00 2001 From: naruse Date: Mon, 18 Mar 2013 02:06:44 +0000 Subject: [PATCH] * vm_exec.h (END_INSN): revert r39517 because the segv seems fixed by r39806. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39807 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ vm_exec.h | 12 ------------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 71a8ed5a8f..c54a357cf0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Mar 18 11:03:23 2013 NARUSE, Yui + + * vm_exec.h (END_INSN): revert r39517 because the segv seems fixed by + r39806. + Mon Mar 18 10:41:06 2013 NARUSE, Yui * vm_exec.c: Correct predefined macro name. This typo is introduced by diff --git a/vm_exec.h b/vm_exec.h index d371054bc9..7d720b5144 100644 --- a/vm_exec.h +++ b/vm_exec.h @@ -116,21 +116,9 @@ error ! #endif /* DISPATCH_DIRECT_THREADED_CODE */ -#if defined(__llvm__) && !defined(__clang__) - /* llvm-gcc may optimize out reg_cfp and cause Stack/cfp consistency error - * when the instruction doesn't use reg_cfp. - * Usually instructions use PUSH() but for example trace doesn't. - * This hack cause speed down but you shouldn't use llvm-gcc, use clang. - */ -#define END_INSN(insn) \ - { rb_control_frame_t *volatile RB_UNUSED_VAR(tmpcfp) = reg_cfp; } \ - DEBUG_END_INSN(); \ - TC_DISPATCH(insn); -#else #define END_INSN(insn) \ DEBUG_END_INSN(); \ TC_DISPATCH(insn); -#endif #define INSN_DISPATCH() \ TC_DISPATCH(__START__) \