Merge pull request ethereum#7682 from ethereum/smt_z3486_tests

[SMTChecker] Update test expectations for z3 4.8.6

Author: ekpyron

.circleci/config.yml

@@ -431,12 +431,12 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - dependencies-osx-{{ .Branch }}-{{ checksum ".circleci/config.yml" }}
+            - dependencies-osx-{{ .Branch }}-{{ checksum ".circleci/config.yml" }}-{{ checksum ".circleci/osx_install_dependencies.sh" }}
       - run:
           name: Install build dependencies
           command: ./.circleci/osx_install_dependencies.sh
       - save_cache:
-          key: dependencies-osx-{{ .Branch }}-{{ checksum ".circleci/config.yml" }}
+          key: dependencies-osx-{{ .Branch }}-{{ checksum ".circleci/config.yml" }}-{{ checksum ".circleci/osx_install_dependencies.sh" }}
           paths:
             - /usr/local/bin
             - /usr/local/sbin
@@ -459,7 +459,7 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - dependencies-osx-{{ .Branch }}-{{ checksum ".circleci/config.yml" }}
+            - dependencies-osx-{{ .Branch }}-{{ checksum ".circleci/config.yml" }}-{{ checksum ".circleci/osx_install_dependencies.sh" }}
       - attach_workspace:
           at: build
       - run: *run_soltest
@@ -475,7 +475,7 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - dependencies-osx-{{ .Branch }}-{{ checksum ".circleci/config.yml" }}
+            - dependencies-osx-{{ .Branch }}-{{ checksum ".circleci/config.yml" }}-{{ checksum ".circleci/osx_install_dependencies.sh" }}
       - attach_workspace:
           at: build
       - run: *run_cmdline_tests

.circleci/osx_install_dependencies.sh

@@ -43,13 +43,13 @@ then
   ./scripts/install_obsolete_jsoncpp_1_7_4.sh
 
   # z3
-  wget https://github.com/Z3Prover/z3/releases/download/Z3-4.8.5/z3-4.8.5-x64-osx-10.14.2.zip
-  unzip z3-4.8.5-x64-osx-10.14.2.zip
-  rm -f z3-4.8.5-x64-osx-10.14.2.zip
-  cp z3-4.8.5-x64-osx-10.14.2/bin/libz3.a /usr/local/lib
-  cp z3-4.8.5-x64-osx-10.14.2/bin/z3 /usr/local/bin
-  cp z3-4.8.5-x64-osx-10.14.2/include/* /usr/local/include
-  rm -rf z3-4.8.5-x64-osx-10.14.2
+  wget https://github.com/Z3Prover/z3/releases/download/z3-4.8.6/z3-4.8.6-x64-osx-10.14.6.zip
+  unzip z3-4.8.6-x64-osx-10.14.6.zip
+  rm -f z3-4.8.6-x64-osx-10.14.6.zip
+  cp z3-4.8.6-x64-osx-10.14.6/bin/libz3.a /usr/local/lib
+  cp z3-4.8.6-x64-osx-10.14.6/bin/z3 /usr/local/bin
+  cp z3-4.8.6-x64-osx-10.14.6/include/* /usr/local/include
+  rm -rf z3-4.8.6-x64-osx-10.14.6
 
   # evmone
   wget https://github.com/ethereum/evmone/releases/download/v0.1.0/evmone-0.1.0-darwin-x86_64.tar.gz

test/libsolidity/smtCheckerTests/invariants/loop_array_for.sol

@@ -7,10 +7,11 @@ contract Simple {
 		for (i = 0; i < n; ++i)
 			a[i] = i;
 		require(n > 1);
-		// Assertion is safe but current solver version cannot solve it.
+		// Assertion is safe but current solver version times out.
 		// Keep test for next solver release.
 		assert(a[n-1] > a[n-2]);
 	}
 }
 // ----
-// Warning: (267-290): Assertion violation happens here
+// Warning: (261-284): Error trying to invoke SMT solver.
+// Warning: (261-284): Assertion violation happens here

test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_storage_memory.sol

@@ -14,11 +14,13 @@ contract LoopFor2 {
 			c[i] = b[i];
 			++i;
 		}
+		// Fails as false positive.
 		assert(b[0] == c[0]);
 		assert(a[0] == 900);
 		assert(b[0] == 900);
 	}
 }
 // ----
-// Warning: (290-309): Assertion violation happens here
-// Warning: (313-332): Assertion violation happens here
+// Warning: (296-316): Assertion violation happens here
+// Warning: (320-339): Assertion violation happens here
+// Warning: (343-362): Assertion violation happens here