Merge pull request #2183 from crytic/dev

sync master <> dev

README.md

@@ -1,4 +1,4 @@
-# [Slither, the smart contrat static analyzer](https://crytic.github.io/slither/slither.html)
+# [Slither, the smart contract static analyzer](https://crytic.github.io/slither/slither.html)
 
 <img src="https://raw.githubusercontent.com/crytic/slither/master/logo.png" alt="Slither Static Analysis Framework Logo" width="500" />
 

slither/core/dominators/utils.py

@@ -10,20 +10,19 @@ def intersection_predecessor(node: "Node") -> Set["Node"]:
     if not node.fathers:
         return set()
 
-    # Revert PR1984
     ret = node.fathers[0].dominators
     for pred in node.fathers[1:]:
         ret = ret.intersection(pred.dominators)
-    # if not any(father.is_reachable for father in node.fathers):
-    #     return set()
-    #
-    # ret = set()
-    # for pred in node.fathers:
-    #     ret = ret.union(pred.dominators)
-    #
-    # for pred in node.fathers:
-    #     if pred.is_reachable:
-    #         ret = ret.intersection(pred.dominators)
+    if not any(father.is_reachable for father in node.fathers):
+        return set()
+
+    ret = set()
+    for pred in node.fathers:
+        ret = ret.union(pred.dominators)
+
+    for pred in node.fathers:
+        if pred.is_reachable:
+            ret = ret.intersection(pred.dominators)
     return ret
 
 
@@ -96,9 +95,8 @@ def compute_dominance_frontier(nodes: List["Node"]) -> None:
     for node in nodes:
         if len(node.fathers) >= 2:
             for father in node.fathers:
-                # Revert PR1984
-                # if not father.is_reachable:
-                #     continue
+                if not father.is_reachable:
+                    continue
                 runner = father
                 # Corner case: if there is a if without else
                 # we need to add update the conditional node

slither/printers/guidance/echidna.py

@@ -138,12 +138,17 @@ def _extract_assert(contracts: List[Contract]) -> Dict[str, Dict[str, List[Dict]
     """
     ret: Dict[str, Dict[str, List[Dict]]] = {}
     for contract in contracts:
-        functions_using_assert: Dict[str, List[Dict]] = defaultdict(list)
+        functions_using_assert = []  # Dict[str, List[Dict]] = defaultdict(list)
         for f in contract.functions_entry_points:
-            for node in f.all_nodes():
-                if SolidityFunction("assert(bool)") in node.solidity_calls and node.source_mapping:
-                    func_name = _get_name(f)
-                    functions_using_assert[func_name].append(node.source_mapping.to_json())
+            for v in f.all_solidity_calls():
+                if v == SolidityFunction("assert(bool)"):
+                    functions_using_assert.append(_get_name(f))
+                    break
+            # Revert https://github.com/crytic/slither/pull/2105 until format is supported by echidna.
+            # for node in f.all_nodes():
+            #     if SolidityFunction("assert(bool)") in node.solidity_calls and node.source_mapping:
+            #         func_name = _get_name(f)
+            #         functions_using_assert[func_name].append(node.source_mapping.to_json())
         if functions_using_assert:
             ret[contract.name] = functions_using_assert
     return ret

slither/vyper_parsing/declarations/function.py

@@ -184,6 +184,7 @@ def analyze_content(self) -> None:
             self._function.is_implemented = True
             self._function.is_empty = False
             self._parse_cfg(body)
+            self._update_reachability(self._function.entry_point)
         else:
             self._function.is_implemented = False
             self._function.is_empty = True
@@ -243,6 +244,12 @@ def _new_node(
     # region Parsing function
     ###################################################################################
     ###################################################################################
+    def _update_reachability(self, node: Node) -> None:
+        if node.is_reachable:
+            return
+        node.set_is_reachable(True)
+        for son in node.sons:
+            self._update_reachability(son)
 
     # pylint: disable=too-many-branches,too-many-statements,protected-access,too-many-locals
     def _parse_cfg(self, cfg: List[ASTNode]) -> None: