Avoid fixpoint for literals and concrete storage

bench/bench-perf.hs

@@ -121,6 +121,7 @@ main = do
                    , ("contractCreation", contractCreation, Nothing)
                    , ("contractCreationMem", contractCreationMem, Nothing)
                    , ("arrayCreationMem", arrayCreationMem, Just 9)
+                   , ("mapStorage", mapStorage, Nothing)
                    ]
   defaultMain =<< mapM f benchmarks
 
@@ -301,3 +302,20 @@ arrayCreationMem n = do
           }
         |]
   fmap fromJust (runApp $ solcRuntime "A" src)
+
+-- Create large map in storage
+mapStorage :: Int -> IO ByteString
+mapStorage n = do
+  let src =
+        [i|
+          struct C { uint256 a; uint256 b; }
+          contract A {
+            mapping(uint256 => mapping(uint256 => C)) m;
+            function main() public {
+              for (uint i = 0; i < ${n}; i++) {
+                m[i][${n}-i] = C(i, ${n});
+              }
+            }
+          }
+        |]
+  fmap fromJust (runApp $ solcRuntime "A" src)

src/EVM/Expr.hs

@@ -965,6 +965,8 @@ simplify :: Expr a -> Expr a
 simplify e = untilFixpoint (simplifyNoLitToKeccak . litToKeccak) e
 
 simplifyNoLitToKeccak :: Expr a -> Expr a
+simplifyNoLitToKeccak l@(Lit _) = l
+simplifyNoLitToKeccak s@(ConcreteStore _) = s
 simplifyNoLitToKeccak e = untilFixpoint (mapExpr go) e
   where
     go :: Expr a -> Expr a