Merge branch 'master' into symbolic-sockets

* master:
  Bump to CheckoutV2 (trailofbits#1654)
  Add support for `sys_arm_fadvise64_64` (trailofbits#1648)
  Add __slots__ to expressions (trailofbits#1635)
  Swap remaining uses of `Z3Solver()` to use the singleton interface (trailofbits#1649)
  CI: have pytest report 100 slowest tests (trailofbits#1646)
  Add a syscall implementation for `llseek` (trailofbits#1640) (and some type hints)
  Added support for proc/self/maps (trailofbits#1639)
  Add missing support for ARM modified immediate encodings (trailofbits#1638)
  Transparently compress & decompress persisted state files (trailofbits#1624)
  Attempt to fix Truffle tests (trailofbits#1637)
  Skip basic blocks that unavoidably end in REVERT. (trailofbits#1630)

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: Set up Python 3.6
       uses: actions/setup-python@v1
       with:
@@ -34,13 +34,17 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        type: ["examples", "ethereum", "ethereum_bench", "ethereum_vm", "native", "wasm", "wasm_sym", "other"]
+        type: ["ethereum_bench", "examples", "ethereum", "ethereum_vm", "native", "wasm", "wasm_sym", "other"]
     steps:
     - uses: actions/checkout@v1
     - name: Set up Python 3.6
       uses: actions/setup-python@v1
       with:
         python-version: 3.6
+    - name: Install NPM
+      uses: actions/setup-node@v1
+      with:
+        node-version: '13.x'
     - name: Install dependencies
       env:
         TEST_TYPE: ${{ matrix.type }}
@@ -146,11 +150,6 @@ jobs:
         }
 
         install_truffle(){
-            curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.34.0/install.sh | bash
-            source ~/.nvm/nvm.sh
-            nvm install --lts
-            nvm use --lts
-
             npm install -g truffle
         }
 
@@ -177,7 +176,7 @@ jobs:
 
         run_tests_from_dir() {
             DIR=$1
-            pytest --cov=manticore -n auto "tests/$DIR"
+            pytest --durations=100 --cov=manticore -n auto "tests/$DIR"
             coverage xml
         }
 

manticore/core/smtlib/constraints.py

@@ -158,7 +158,7 @@ def to_string(self, related_to=None, replace_constants=False):
                 if (
                     isinstance(expression, BoolEqual)
                     and isinstance(expression.operands[0], Variable)
-                    and isinstance(expression.operands[1], (Variable, Constant))
+                    and isinstance(expression.operands[1], (*Variable, *Constant))
                 ):
                     constant_bindings[expression.operands[0]] = expression.operands[1]
 
@@ -327,7 +327,7 @@ def migrate(self, expression, name_migration_map=None):
                     ).array
                 else:
                     raise NotImplemented(
-                        f"Unknown expression type {type(var)} encountered during expression migration"
+                        f"Unknown expression type {type(foreign_var)} encountered during expression migration"
                     )
                 # Update the var to var mapping
                 object_migration_map[foreign_var] = new_var