diff --git a/ChangeLog b/ChangeLog
index 4eb41db18d..6b84b766a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul 26 22:14:10 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_exec.h (CHECK_VM_STACK_OVERFLOW_FOR_INSN): surround with
+	  do/while (0), and remove unnecessary casts.
+
 Fri Jul 26 20:12:07 2013  Akinori MUSHA  <knu@iDaemons.org>
 
 	* ext/syslog/lib/syslog/logger.rb (Syslog::Logger): Add facility
diff --git a/vm_exec.h b/vm_exec.h
index b785c4fdd3..c92f715594 100644
--- a/vm_exec.h
+++ b/vm_exec.h
@@ -169,9 +169,12 @@ default:                        \
 #endif
 
 #define SCREG(r) (reg_##r)
-#define CHECK_VM_STACK_OVERFLOW_FOR_INSN(cfp, margin) \
-  if ((VALUE *)((char *)(((VALUE *)(cfp)->sp) + (margin)) + sizeof(rb_control_frame_t)) >= ((VALUE *)(cfp))) { \
-      rb_bug("CHECK_VM_STACK_OVERFLOW_FOR_INSN: should not overflow here. Please contact ruby-core/dev with your (a part of) script. This check will be removed soon."); \
-  } while (0);
+#define CHECK_VM_STACK_OVERFLOW_FOR_INSN(cfp, margin) do { \
+    if (((rb_control_frame_t *)(((cfp)->sp) + (margin)) + 1) >= (cfp)) { \
+	rb_bug("CHECK_VM_STACK_OVERFLOW_FOR_INSN: should not overflow here. " \
+	       "Please contact ruby-core/dev with your (a part of) script. " \
+	       "This check will be removed soon."); \
+    } \
+} while (0)
 
 #endif /* RUBY_VM_EXEC_H */