test updates

Author: Mohammad Rezaei

test/libevmasm/evmAssemblyTests/constant_optimizer_runs_0.asm

@@ -23,6 +23,9 @@ PUSH 0x2
     // PUSH0 NOT shift right:
     PUSH 0x3ffffffff
     PUSH 0x3ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+    // PUSH0 NOT shift left:
+    PUSH 0xffffffffffffffffffffffffffff000000000000000000000000000000000000
+    PUSH 0xffffff0000000000000000000000000000000000000000000000000000000000
     // PUSH0 NOT shift right then left:
     PUSH 0x1fffffffffffffffe0000000000000000000000000000000000000000000
     PUSH 0x7ffffffffffffff0000000000000000
@@ -57,17 +60,19 @@ PUSH 0x2
 //       shl(0xe2, 0x0828703f)
 //       not(0x00)
 //       not(0x752f)
-//       not(0xffffffff)
+//       shl(0x20, not(0x00))
 //       not(shl(0x40, 0xffffffff))
-//       0x03ffffffff
-//       sub(shl(0xfa, 0x01), 0x01)
-//       sub(shl(0xed, 0x01), shl(0xad, 0x01))
-//       sub(shl(0x7b, 0x01), shl(0x40, 0x01))
-//       add(shl(0xf0, 0x01), shl(0xac, 0x03))
-//       add(shl(0x60, 0x100000000001), shl(0x2c, 0x01))
-//       not(sub(shl(0x80, 0x0200000001), shl(0x40, 0x01)))
-//       not(add(shl(0x80, 0xffffffff), 0xffffffff))
-//       add(shl(0xea, 0x01deaf), 0x01)
+//       shr(0xde, not(0x00))
+//       shr(0x06, not(0x00))
+//       shl(0x90, not(0x00))
+//       shl(0xe8, not(0x00))
+//       shl(0xad, shr(0xc0, not(0x00)))
+//       shl(0x40, shr(0xc5, not(0x00)))
+//       shl(0xac, or(0x03, shl(0x44, 0x01)))
+//       shl(0x2c, or(0x01, shl(0x34, 0x100000000001)))
+//       not(shl(0x40, or(shr(0xc0, not(0x00)), shl(0x61, 0x01))))
+//       or(shl(0x20, shr(0xa0, not(0x00))), shl(0xa0, not(0x00)))
+//       or(0x01, shl(0xea, 0x01deaf))
 //       sub(shl(0x46, 0x01), 0x40)
 //       sub(shl(0x40, 0x01), 0x20)
 // }

test/libevmasm/evmAssemblyTests/constant_optimizer_runs_200.asm

@@ -21,6 +21,9 @@ PUSH 0x2
     // PUSH0 NOT shift right:
     PUSH 0x3ffffffff
     PUSH 0x3ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+    // PUSH0 NOT shift left:
+    PUSH 0xffffffffffffffffffffffffffff000000000000000000000000000000000000
+    PUSH 0xffffff0000000000000000000000000000000000000000000000000000000000
     // PUSH0 NOT shift right then left:
     PUSH 0x1fffffffffffffffe0000000000000000000000000000000000000000000
     PUSH 0x7ffffffffffffff0000000000000000
@@ -56,14 +59,16 @@ PUSH 0x2
 //       not(0xffffffff)
 //       not(0xffffffff0000000000000000)
 //       0x03ffffffff
-//       sub(shl(0xfa, 0x01), 0x01)
+//       shr(0x06, not(0x00))
+//       shl(0x90, not(0x00))
+//       shl(0xe8, 0xffffff)
 //       shl(0xad, 0xffffffffffffffff)
 //       0x07ffffffffffffff0000000000000000
 //       shl(0xac, 0x100000000000000003)
 //       0x100000000001000000000000100000000000
 //       not(0x0200000000ffffffffffffffff0000000000000000)
 //       not(0xffffffff000000000000000000000000ffffffff)
-//       add(shl(0xea, 0x01deaf), 0x01)
+//       or(0x01, shl(0xea, 0x01deaf))
 //       0x3fffffffffffffffc0
 //       0xffffffffffffffe0
 // }

test/libevmasm/evmAssemblyTests/constant_optimizer_runs_2M.asm

@@ -23,6 +23,9 @@ PUSH 0x2
     // PUSH0 NOT shift right:
     PUSH 0x3ffffffff
     PUSH 0x3ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+    // PUSH0 NOT shift left:
+    PUSH 0xffffffffffffffffffffffffffff000000000000000000000000000000000000
+    PUSH 0xffffff0000000000000000000000000000000000000000000000000000000000
     // PUSH0 NOT shift right then left:
     PUSH 0x1fffffffffffffffe0000000000000000000000000000000000000000000
     PUSH 0x7ffffffffffffff0000000000000000
@@ -61,6 +64,8 @@ PUSH 0x2
 //       0xffffffffffffffffffffffffffffffffffffffff00000000ffffffffffffffff
 //       0x03ffffffff
 //       0x03ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+//       0xffffffffffffffffffffffffffff000000000000000000000000000000000000
+//       0xffffff0000000000000000000000000000000000000000000000000000000000
 //       0x1fffffffffffffffe0000000000000000000000000000000000000000000
 //       0x07ffffffffffffff0000000000000000
 //       0x01000000000000000030000000000000000000000000000000000000000000

test/libsolidity/SolidityOptimizer.cpp

@@ -420,14 +420,6 @@ BOOST_AUTO_TEST_CASE(computing_constants)
 			++iter;
 	}
 	BOOST_CHECK_EQUAL(2, occurrences);
-
-	bytes constantWithZeros = toBigEndian(u256("0x77abc0000000000000000000000000000000000000000000000000000000001"));
-	BOOST_CHECK(search(
-		optimizedBytecode.cbegin(),
-		optimizedBytecode.cend(),
-		constantWithZeros.cbegin(),
-		constantWithZeros.cend()
-	) == optimizedBytecode.cend());
 }