diff --git a/ChangeLog b/ChangeLog
index 19203547eb..8c1e884df0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 28 03:01:27 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* vm_insnhelper.c (vm_call_cfunc): adding back useless hack.  For some
+	  reason, this fixes CFP errors on OS X 10.7.
+
 Fri Oct 28 00:09:31 2011  Tanaka Akira  <akr@fsij.org>
 
 	* ext/sdbm/_sdbm.c (sdbm_prep): refactored for less nesting.
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 250ea3e954..798aaa69d1 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -406,6 +406,10 @@ vm_call_cfunc(rb_thread_t *th, rb_control_frame_t *reg_cfp,
     if (reg_cfp != th->cfp + 1) {
 	rb_bug("cfp consistency error - send");
     }
+#ifdef __llvm__
+#define RB_LLVM_GUARD(v) (*RB_GC_GUARD_PTR((volatile VALUE *)&(v)))
+    RB_LLVM_GUARD(reg_cfp);
+#endif
 
     vm_pop_frame(th);