Minor changes from review.

waynemunro · Jan 12, 2017 · 3cfa851 · 3cfa851
1 parent a32def5
commit 3cfa851
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,7 +1,7 @@
 ### 0.4.8 (unreleased)
 
 Features:
- * Optimiser: Performance improments.
+ * Optimiser: Performance improvements.
  * Output: Print assembly in new standardized Solidity assembly format.
 
 Bugfixes:

diff --git a/cmake/EthCompilerSettings.cmake b/cmake/EthCompilerSettings.cmake
@@ -71,7 +71,7 @@ if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MA
 	add_compile_options(-fPIC)
 
 	# 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_RELEASE        "-O3 -DNDEBUG")
 	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")

diff --git a/libevmasm/AssemblyItem.h b/libevmasm/AssemblyItem.h
@@ -86,7 +86,6 @@ class AssemblyItem
 
 	AssemblyItemType type() const { return m_type; }
 	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); }
 
 	/// @returns the instruction of this item (only valid if type() == Operation)

diff --git a/libevmasm/ConstantOptimiser.cpp b/libevmasm/ConstantOptimiser.cpp
@@ -60,7 +60,7 @@ unsigned ConstantOptimisationMethod::optimiseConstants(
 			replacement = copy.execute(_assembly);
 			optimisations++;
 		}
-		else if (computeGas < literalGas && computeGas < copyGas)
+		else if (computeGas < literalGas && computeGas <= copyGas)
 		{
 			replacement = compute.execute(_assembly);
 			optimisations++;