Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Fixing jit compilation #1406

Merged
merged 1 commit into from
Jun 23, 2016
Merged

Fixing jit compilation #1406

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions ethcore/src/evm/jit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@

//! Just in time compiler execution environment.
use common::*;
use trace::VMTracer;
use evmjit;
use evm::{self, Error, GasLeft};
use evm::{self, GasLeft};

/// Should be used to convert jit types to ethcore
trait FromJit<T>: Sized {
Expand Down Expand Up @@ -303,7 +302,7 @@ impl<'a> evmjit::Ext for ExtAdapter<'a> {

#[derive(Default)]
pub struct JitEvm {
ctxt: Option<evmjit::ContextHandle>,
context: Option<evmjit::ContextHandle>,
}

impl evm::Evm for JitEvm {
Expand Down Expand Up @@ -347,7 +346,7 @@ impl evm::Evm for JitEvm {
data.timestamp = ext.env_info().timestamp as i64;

self.context = Some(unsafe { evmjit::ContextHandle::new(data, schedule, &mut ext_handle) });
let context = self.context.as_ref_mut().unwrap();
let mut context = self.context.as_mut().unwrap();
let res = context.exec();

match res {
Expand Down