diff options
| author | chriseth <chris@ethereum.org> | 2018-05-02 22:50:15 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-02 22:50:15 +0800 |
| commit | a856135bbf709d17732ce610e086c2300783b0a9 (patch) | |
| tree | c52cc5f5c2b7f263b18ac78ef3cc3760155a4726 /libsolidity/interface/GasEstimator.cpp | |
| parent | de2c8fd684dd7c2a29460f64ffc891f1d6353cc8 (diff) | |
| parent | 971941b3f6402665662d85eb9b31060f0ae230fb (diff) | |
| download | dexon-solidity-a856135bbf709d17732ce610e086c2300783b0a9.tar dexon-solidity-a856135bbf709d17732ce610e086c2300783b0a9.tar.gz dexon-solidity-a856135bbf709d17732ce610e086c2300783b0a9.tar.bz2 dexon-solidity-a856135bbf709d17732ce610e086c2300783b0a9.tar.lz dexon-solidity-a856135bbf709d17732ce610e086c2300783b0a9.tar.xz dexon-solidity-a856135bbf709d17732ce610e086c2300783b0a9.tar.zst dexon-solidity-a856135bbf709d17732ce610e086c2300783b0a9.zip | |
Merge pull request #3797 from ethereum/shift-constantinople
Use native shift instructions on Constantinople
Diffstat (limited to 'libsolidity/interface/GasEstimator.cpp')
| -rw-r--r-- | libsolidity/interface/GasEstimator.cpp | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/libsolidity/interface/GasEstimator.cpp b/libsolidity/interface/GasEstimator.cpp index a496cc21..a532f86e 100644 --- a/libsolidity/interface/GasEstimator.cpp +++ b/libsolidity/interface/GasEstimator.cpp @@ -136,13 +136,22 @@ GasEstimator::GasConsumption GasEstimator::functionalEstimation( ExpressionClasses& classes = state->expressionClasses(); using Id = ExpressionClasses::Id; using Ids = vector<Id>; - // div(calldataload(0), 1 << 224) equals to hashValue Id hashValue = classes.find(u256(FixedHash<4>::Arith(FixedHash<4>(dev::keccak256(_signature))))); Id calldata = classes.find(Instruction::CALLDATALOAD, Ids{classes.find(u256(0))}); - classes.forceEqual(hashValue, Instruction::DIV, Ids{ - calldata, - classes.find(u256(1) << 224) - }); + if (!m_evmVersion.hasBitwiseShifting()) + // div(calldataload(0), 1 << 224) equals to hashValue + classes.forceEqual( + hashValue, + Instruction::DIV, + Ids{calldata, classes.find(u256(1) << 224)} + ); + else + // shr(0xe0, calldataload(0)) equals to hashValue + classes.forceEqual( + hashValue, + Instruction::SHR, + Ids{classes.find(u256(0xe0)), calldata} + ); // lt(calldatasize(), 4) equals to 0 (ignore the shortcut for fallback functions) classes.forceEqual( classes.find(u256(0)), |