Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

removed volatile qualifier on parameter for ruby_cleanup().

corrected volatile qualifier on block_pass()'s NODE *,
removed unneeded label in eval_opt_n(),
removed unneeded result assignment in rb_call0,
added missed volatile qualifiers in rb_load()
  • Loading branch information...
commit c54ab215bc83cb32f447207b7992f6841596691a 1 parent 6215f78
@brentr authored
Showing with 15 additions and 17 deletions.
  1. +10 −12 eval.c
  2. +5 −5 version.h
View
22 eval.c
@@ -221,7 +221,7 @@ static VALUE proc_invoke _((VALUE,VALUE,VALUE,VALUE));
static VALUE rb_f_binding _((VALUE));
NOINLINE(static void rb_f_END _((void)));
static VALUE rb_f_block_given_p _((void));
-static VALUE block_pass _((volatile VALUE, volatile NODE *));
+static VALUE block_pass _((volatile VALUE, NODE *volatile));
VALUE rb_cMethod;
static VALUE method_call _((int, VALUE*, VALUE));
@@ -1600,12 +1600,13 @@ ruby_finalize()
}
int
-ruby_cleanup(ex)
- volatile int ex;
+ruby_cleanup(exArg)
+ int exArg;
{
int state;
volatile VALUE errs[2];
unsigned nerr;
+ volatile int ex = exArg;
errs[1] = ruby_errinfo;
ruby_safe_level = 0;
@@ -3003,8 +3004,9 @@ eval_node_volatile(opt_n, void)
int state;
PUSH_TAG(PROT_LOOP);
switch (state = EXEC_TAG()) {
+ case TAG_NEXT:
+ state = 0;
case 0:
- opt_n_next:
while (!NIL_P(rb_gets())) {
opt_n_redo:
rb_eval(self, node->nd_body);
@@ -3014,9 +3016,7 @@ eval_node_volatile(opt_n, void)
case TAG_REDO:
state = 0;
goto opt_n_redo;
- case TAG_NEXT:
- state = 0;
- goto opt_n_next;
+
case TAG_BREAK:
state = 0;
default:
@@ -6193,8 +6193,6 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
result = prot_tag->retval;
state = 0;
}
- else
- result = Qnil;
POP_TAG();
if (event_hooks) {
EXEC_EVENT_HOOK(RUBY_EVENT_RETURN, ruby_current_node,
@@ -7104,10 +7102,10 @@ rb_load(fname, wrap)
VALUE tmp;
int state;
volatile int prohibit_int = rb_prohibit_interrupt;
- ID last_func;
+ volatile ID last_func;
volatile VALUE wrapper = ruby_wrapper;
VALUE self = ruby_top_self;
- NODE *last_node;
+ NODE *volatile last_node;
NODE *volatile saved_cref = ruby_cref;
if (wrap && ruby_safe_level >= 4) {
@@ -9243,7 +9241,7 @@ proc_binding(proc)
static VALUE
block_pass(self, node)
volatile VALUE self;
- volatile NODE *node;
+ NODE *volatile node;
{
volatile VALUE proc = rb_eval(self, node->nd_body);
VALUE b;
View
10 version.h
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-2-27"
+#define RUBY_RELEASE_DATE "2009-3-1"
#define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090227
+#define RUBY_RELEASE_CODE 20090301
#define RUBY_PATCHLEVEL 72
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 7
#define RUBY_RELEASE_YEAR 2009
-#define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 27
+#define RUBY_RELEASE_MONTH 3
+#define RUBY_RELEASE_DAY 1
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];
@@ -35,7 +35,7 @@ RUBY_EXTERN const char *ruby_copyright;
#define _mbari_rev_ "mbari"
#endif
-#define MBARI_RELEASE(wipe_sites) _mbari_rev_ " 8A/" string_arg(wipe_sites)
+#define MBARI_RELEASE(wipe_sites) _mbari_rev_ " 8B/" string_arg(wipe_sites)
#define RUBY_RELEASE_STR MBARI_RELEASE(STACK_WIPE_SITES) " on patchlevel"
#define RUBY_RELEASE_NUM RUBY_PATCHLEVEL
Please sign in to comment.
Something went wrong with that request. Please try again.