Permalink
Browse files

Explicitly use vm_jit inside state

This pointer was setup because the JIT needs access to it, but recent
clang versions saw it wasn't used in any of the C++ parts. This change
makes sure that we explicitly use it in at least one place so clang
doesn't complain.

Fixes #2137
  • Loading branch information...
1 parent 64ad90f commit cff54af1e75b330c82429e80a9a27cea4a0366d8 @dbussink dbussink committed Jan 30, 2013
Showing with 4 additions and 3 deletions.
  1. +3 −3 vm/state.hpp
  2. +1 −0 vm/vm_jit.hpp
View
@@ -10,13 +10,13 @@ namespace rubinius {
class State {
VM* vm_;
- VMJIT& vm_jit_;
+ VMJIT* vm_jit_;
SharedState& shared_;
public:
State(VM* vm)
: vm_(vm)
- , vm_jit_(vm->vm_jit_)
+ , vm_jit_(&vm->vm_jit_)
, shared_(vm->shared)
{}
@@ -88,7 +88,7 @@ namespace rubinius {
}
bool check_local_interrupts() {
- return vm_->check_local_interrupts();
+ return vm_jit_->check_local_interrupts_;
}
bool check_async(CallFrame* call_frame) {
View
@@ -9,6 +9,7 @@ namespace rubinius {
class VMJIT {
friend class VM;
+ friend class State;
private:
uintptr_t stack_start_;

0 comments on commit cff54af

Please sign in to comment.