From 5f1b70788113a05309c50710ee8ad13f1a3b2154 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Thu, 26 Oct 2017 07:06:00 -0600 Subject: [PATCH] unbreak no-futures/no-places build --- racket/src/racket/src/jitcommon.c | 8 ++++---- racket/src/racket/src/vector.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/racket/src/racket/src/jitcommon.c b/racket/src/racket/src/jitcommon.c index 5ef6b948a9..0d15cd7ed8 100644 --- a/racket/src/racket/src/jitcommon.c +++ b/racket/src/racket/src/jitcommon.c @@ -553,11 +553,11 @@ static int common1b(mz_jit_state *jitter, void *_data) we use mz_finish_lwe because it will capture the stack, and the ts_ version because we may be in a future */ for (i = 0; i < 2; i++) { - ref = jit_get_ip(); + ref2 = jit_get_ip(); if (!i) - sjc.box_cas_fail_code = ref; + sjc.box_cas_fail_code = ref2; else - sjc.vector_cas_fail_code = ref; + sjc.vector_cas_fail_code = ref2; mz_prolog(JIT_R2); JIT_UPDATE_THREAD_RSPTR(); if (!i) @@ -572,7 +572,7 @@ static int common1b(mz_jit_state *jitter, void *_data) (void)mz_finish_lwe(ts_scheme_box_cas, ref); /* doesn't return */ else (void)mz_finish_lwe(ts_scheme_checked_vector_cas, ref); /* doesn't return */ - scheme_jit_register_sub_func(jitter, ref, scheme_false); + scheme_jit_register_sub_func(jitter, ref2, scheme_false); } /* *** bad_vector_length_code *** */ diff --git a/racket/src/racket/src/vector.c b/racket/src/racket/src/vector.c index 3ad9eb6535..7b098890ac 100644 --- a/racket/src/racket/src/vector.c +++ b/racket/src/racket/src/vector.c @@ -1175,7 +1175,7 @@ static Scheme_Object *unsafe_struct_star_cas (int argc, Scheme_Object *argv[]) #else /* For cooperative threading, no atomicity required */ if (((Scheme_Structure *)s)->slots[SCHEME_INT_VAL(idx)] == ov) { - SCHEME_VEC_ELS(vec)[SCHEME_INT_VAL(idx)] = nv; + ((Scheme_Structure *)s)->slots[SCHEME_INT_VAL(idx)] = nv; return scheme_true; } else { return scheme_false;