Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ordering of sons when parsing for loop #524

Merged
merged 3 commits into from
Jul 12, 2020
Merged

Fix ordering of sons when parsing for loop #524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
955ad39
fix ordering of sons when parsing for loop
samczsun Jun 25, 2020
dfe0e65
Node.son_true/son_false: minor
montyly Jul 12, 2020
096915a
declaration.function: minor refactor if IF/IFLOOP detection
montyly Jul 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions slither/core/cfg/node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,13 +650,13 @@ def sons(self) -> List["Node"]:

@property
def son_true(self) -> Optional["Node"]:
if self.type == NodeType.IF:
if self.type in [NodeType.IF, NodeType.IFLOOP]:
return self._sons[0]
return None

@property
def son_false(self) -> Optional["Node"]:
if self.type == NodeType.IF and len(self._sons) >= 1:
if self.type in [NodeType.IF, NodeType.IFLOOP] and len(self._sons) >= 1:
return self._sons[1]
return None

Expand Down
2 changes: 1 addition & 1 deletion slither/core/declarations/function.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1282,7 +1282,7 @@ def slithir_cfg_to_dot_str(self) -> str:
if node.irs:
label += "\nIRs:\n" + "\n".join([str(ir) for ir in node.irs])
content += '{}[label="{}"];\n'.format(node.node_id, label)
if node.type == NodeType.IF:
if node.type in [NodeType.IF, NodeType.IFLOOP]:
true_node = node.son_true
if true_node:
content += '{}->{}[label="True"];\n'.format(node.node_id, true_node.node_id)
Expand Down
20 changes: 14 additions & 6 deletions slither/solc_parsing/declarations/function.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,18 +398,24 @@ def _parse_for_compact_ast(self, statement: Dict, node: NodeSolc) -> NodeSolc:
node_condition = self._new_node(NodeType.IFLOOP, condition["src"])
node_condition.add_unparsed_expression(condition)
link_underlying_nodes(node_startLoop, node_condition)
link_underlying_nodes(node_condition, node_endLoop)

node_beforeBody = node_condition
else:
node_condition = node_startLoop
node_condition = None

node_beforeBody = node_startLoop

node_body = self._parse_statement(body, node_beforeBody)

node_body = self._parse_statement(body, node_condition)
if node_condition:
link_underlying_nodes(node_condition, node_endLoop)

node_LoopExpression = None
if loop_expression:
node_LoopExpression = self._parse_statement(loop_expression, node_body)
link_underlying_nodes(node_LoopExpression, node_condition)
link_underlying_nodes(node_LoopExpression, node_beforeBody)
else:
link_underlying_nodes(node_body, node_condition)
link_underlying_nodes(node_body, node_beforeBody)

if not condition:
if not loop_expression:
Expand Down Expand Up @@ -497,13 +503,15 @@ def _parse_for(self, statement: Dict, node: NodeSolc) -> NodeSolc:
# expression = parse_expression(candidate, self)
node_condition.add_unparsed_expression(expression)
link_underlying_nodes(node_startLoop, node_condition)
link_underlying_nodes(node_condition, node_endLoop)
hasCondition = True
else:
hasCondition = False

node_statement = self._parse_statement(children[-1], node_condition)

if hasCondition:
link_underlying_nodes(node_condition, node_endLoop)

node_LoopExpression = node_statement
if hasLoopExpression:
if len(children) > 2:
Expand Down