Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Make sure that we setup a barrier before installing the jitted code

Also make sure we remove the setup call frame at the proper moment.
  • Loading branch information...
commit 3fdd8b5bb986f63aa3bbbe617ae7e03e41054d78 1 parent 880ecc3
@dbussink dbussink authored
Showing with 2 additions and 1 deletion.
  1. +2 −1  vm/llvm/state.cpp
View
3  vm/llvm/state.cpp
@@ -328,6 +328,7 @@ namespace rubinius {
jit::RuntimeDataHolder* rd = jit.context().runtime_data_holder();
+ atomic::memory_barrier();
ls_->start_method_update();
if(!req->is_block()) {
@@ -687,12 +688,12 @@ namespace rubinius {
state->set_call_frame(call_frame);
state->gc_independent(gct);
- state->set_call_frame(0);
wait_cond.wait(wait_mutex);
wait_mutex.unlock();
state->gc_dependent();
+ state->set_call_frame(0);
// if(config().jit_inline_debug) {
// if(block) {
// log() << "JIT: compiled block inside: "

0 comments on commit 3fdd8b5

Please sign in to comment.
Something went wrong with that request. Please try again.