archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-20 11:03:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) r33303:

Browse source 
------------------------------------------------------------------------
r33303 | naruse | 2011-09-20 21:16:08 +0900 (Tue, 20 Sep 2011) | 3 lines

Avoid cfp consistency error by LLVM.

volatile is not enough.
------------------------------------------------------------------------


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33304 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2011-09-20 15:04:07 +00:00
parent b4519b3b8a
commit e0d1292e35
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL -1
#define RUBY_RELEASE_DATE "2011-09-17"
#define RUBY_RELEASE_DATE "2011-09-21"
#define RUBY_RELEASE_YEAR 2011
#define RUBY_RELEASE_MONTH 9
#define RUBY_RELEASE_DAY 17
#define RUBY_RELEASE_DAY 21
#include "ruby/version.h"

6
vm_insnhelper.c
View file

@ -386,7 +386,7 @@ call_cfunc(VALUE (*func)(), VALUE recv,
}
static inline VALUE
vm_call_cfunc(rb_thread_t *th, volatile rb_control_frame_t *reg_cfp,
vm_call_cfunc(rb_thread_t *th, rb_control_frame_t *reg_cfp,
int num, volatile VALUE recv, const rb_block_t *blockptr,
const rb_method_entry_t *me)
{
@ -406,6 +406,10 @@ vm_call_cfunc(rb_thread_t *th, volatile 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);