diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | vm.c | 3 | ||||
| -rw-r--r-- | vm_insnhelper.c | 4 |
3 files changed, 6 insertions, 7 deletions
@@ -1,3 +1,9 @@ +Fri Jan 20 17:37:37 2012 NARUSE, Yui <naruse@ruby-lang.org> + + * vm.c (vm_exec): remove workaround for LLVM because r34278 fixes it. + + * vm_insnhelper.c (vm_call_cfunc): ditto. + Fri Jan 20 14:31:43 2012 NARUSE, Yui <naruse@ruby-lang.org> * lib/net/http.rb (Net::HTTP#transport_request): retry a idempotent @@ -1216,9 +1216,6 @@ vm_exec(rb_thread_t *th) vm_loop_start: result = vm_exec_core(th, initial); if ((state = th->state) != 0) { -#ifdef __llvm__ /* LLVM optimization guard for TestEnumerator#test_nested_iteration */ - (void)__extension__({rb_thread_t t = *th; t;}); -#endif err = result; th->state = 0; goto exception_handler; diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 78d6b8a083..92f6f7c1e2 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -454,10 +454,6 @@ 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); |