diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-22 05:42:27 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-22 05:42:27 +0000 |
| commit | c8f2479c6b50e3547f3f0bd48dfa3d9dca639e29 (patch) | |
| tree | b110f557227f30ba75c58809e73777cfb3e982ad /vm_insnhelper.c | |
| parent | 18488c1117dfcb492694b2733cd96dba3602aae3 (diff) | |
merge revision(s) 32688,33309,33408,33864,35874,38012: [Backport #7832]
* vm_method.c (rb_gc_mark_unlinked_live_method_entries): remove unused
variables.
* vm_insnhelper.c (vm_call_cfunc): suppress a warning. note that
`volatile type *var' doesn't make var itself volatile.
* vm_insnhelper.c (vm_call_cfunc): remove useless hack.
* regparse.c (onig_number_of_names): suppress a warning.
* gc.c : remove a unused function.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@39379 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
| -rw-r--r-- | vm_insnhelper.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 4f709e6291..5f7d1ee31b 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -406,10 +406,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(v) - RB_LLVM_GUARD(reg_cfp); -#endif vm_pop_frame(th); |