Fixing jit feature compilation (#2310)

Conflicts:
	Cargo.lock

ethcore/src/evm/jit.rs

@@ -196,6 +196,7 @@ impl<'a> evmjit::Ext for ExtAdapter<'a> {
 				receive_address: *const evmjit::H256,
 				code_address: *const evmjit::H256,
 				transfer_value: *const evmjit::I256,
+				// TODO [ToDr] Why do we ignore that?
 				_apparent_value: *const evmjit::I256,
 				in_beg: *const u8,
 				in_size: u64,
@@ -208,12 +209,12 @@ impl<'a> evmjit::Ext for ExtAdapter<'a> {
 		let sender_address = unsafe { Address::from_jit(&*sender_address) };
 		let receive_address = unsafe { Address::from_jit(&*receive_address) };
 		let code_address = unsafe { Address::from_jit(&*code_address) };
-		// TODO Is it always safe in case of DELEGATE_CALL?
 		let transfer_value = unsafe { U256::from_jit(&*transfer_value) };
 		let value = Some(transfer_value);
 
 		// receive address and code address are the same in normal calls
 		let is_callcode = receive_address != code_address;
+		let is_delegatecall = is_callcode && sender_address != receive_address;
 
 		if !is_callcode && !self.ext.exists(&code_address) {
 			gas_cost = gas_cost + U256::from(self.ext.schedule().call_new_account_gas);
@@ -242,10 +243,10 @@ impl<'a> evmjit::Ext for ExtAdapter<'a> {
 			}
 		}
 
-		// TODO [ToDr] Any way to detect DelegateCall?
-		let call_type = match is_callcode {
-			true => CallType::CallCode,
-			false => CallType::Call,
+		let call_type = match (is_callcode, is_delegatecall) {
+			(_, true) => CallType::DelegateCall,
+			(true, false) => CallType::CallCode,
+			(false, false) => CallType::Call,
 		};
 
 		match self.ext.call(

ethcore/src/lib.rs

@@ -102,7 +102,8 @@ extern crate rand;
 extern crate bit_set;
 extern crate lru_cache;
 
-#[cfg(feature = "jit" )] extern crate evmjit;
+#[cfg(feature = "jit" )]
+extern crate evmjit;
 
 pub mod account_provider;
 pub mod engines;