cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor changes from review.

Browse Source
This commit is contained in:
chriseth 2017-01-12 17:52:23 +01:00
parent a32def5c42
commit 3cfa851f6f
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog.md
View File

@ -1,7 +1,7 @@
### 0.4.8 (unreleased) ### 0.4.8 (unreleased)
Features: Features:
* Optimiser: Performance improments. * Optimiser: Performance improvements.
* Output: Print assembly in new standardized Solidity assembly format. * Output: Print assembly in new standardized Solidity assembly format.
Bugfixes: Bugfixes:

2
cmake/EthCompilerSettings.cmake
View File

@ -71,7 +71,7 @@ if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MA
add_compile_options(-fPIC) add_compile_options(-fPIC)
# Configuration-specific compiler settings. # Configuration-specific compiler settings.
set(CMAKE_CXX_FLAGS_DEBUG " -g -DETH_DEBUG") set(CMAKE_CXX_FLAGS_DEBUG "-Og -g -DETH_DEBUG")
set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG") set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG")
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG") set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")

1
libevmasm/AssemblyItem.h
View File

@ -86,7 +86,6 @@ public:
AssemblyItemType type() const { return m_type; } AssemblyItemType type() const { return m_type; }
u256 const& data() const { assertThrow(m_type != Operation, Exception, ""); return *m_data; } u256 const& data() const { assertThrow(m_type != Operation, Exception, ""); return *m_data; }
//void setType(AssemblyItemType const _type) { m_type = _type; }
void setData(u256 const& _data) { assertThrow(m_type != Operation, Exception, ""); m_data = std::make_shared<u256>(_data); } void setData(u256 const& _data) { assertThrow(m_type != Operation, Exception, ""); m_data = std::make_shared<u256>(_data); }
/// @returns the instruction of this item (only valid if type() == Operation) /// @returns the instruction of this item (only valid if type() == Operation)

2
libevmasm/ConstantOptimiser.cpp
View File

@ -60,7 +60,7 @@ unsigned ConstantOptimisationMethod::optimiseConstants(
replacement = copy.execute(_assembly); replacement = copy.execute(_assembly);
optimisations++; optimisations++;
} }
else if (computeGas < literalGas && computeGas < copyGas) else if (computeGas < literalGas && computeGas <= copyGas)
{ {
replacement = compute.execute(_assembly); replacement = compute.execute(_assembly);
optimisations++; optimisations++;