From 3af629b8afbf611d90b25fe6ce9006a1504c0321 Mon Sep 17 00:00:00 2001
From: Josselin <josselin@trailofbits.com>
Date: Thu, 9 Dec 2021 20:31:23 +0100
Subject: [PATCH] Multiple minor fixes

---
 slither/core/cfg/node.py                          | 13 ++++++++-----
 slither/detectors/statements/write_after_write.py |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/slither/core/cfg/node.py b/slither/core/cfg/node.py
index 42e29ad6d..f5b801595 100644
--- a/slither/core/cfg/node.py
+++ b/slither/core/cfg/node.py
@@ -200,6 +200,7 @@ class Node(SourceMapping, ChildFunction):  # pylint: disable=too-many-public-met
         self._external_calls_as_expressions: List[Expression] = []
         self._internal_calls_as_expressions: List[Expression] = []
         self._irs: List[Operation] = []
+        self._all_slithir_operations: Optional[List[Operation]] = None
         self._irs_ssa: List[Operation] = []
 
         self._state_vars_written: List[StateVariable] = []
@@ -721,11 +722,13 @@ class Node(SourceMapping, ChildFunction):  # pylint: disable=too-many-public-met
         self._find_read_write_call()
 
     def all_slithir_operations(self) -> List[Operation]:
-        irs = self.irs
-        for ir in irs:
-            if isinstance(ir, InternalCall):
-                irs += ir.function.all_slithir_operations()
-        return irs
+        if self._all_slithir_operations is None:
+            irs = list(self.irs)
+            for ir in self.irs:
+                if isinstance(ir, InternalCall):
+                    irs += ir.function.all_slithir_operations()
+            self._all_slithir_operations = irs
+        return self._all_slithir_operations
 
     @staticmethod
     def _is_non_slithir_var(var: Variable):
diff --git a/slither/detectors/statements/write_after_write.py b/slither/detectors/statements/write_after_write.py
index 663a9f46f..c9978188f 100644
--- a/slither/detectors/statements/write_after_write.py
+++ b/slither/detectors/statements/write_after_write.py
@@ -13,7 +13,7 @@ from slither.slithir.operations import (
     LowLevelCall,
     Operation,
 )
-from slither.slithir.variables import ReferenceVariable, TemporaryVariable
+from slither.slithir.variables import ReferenceVariable, TemporaryVariable, TupleVariable
 from slither.slithir.variables.variable import SlithIRVariable
 
 
@@ -59,7 +59,7 @@ def _handle_ir(
         if (
             ir.lvalue
             and isinstance(ir.lvalue.type, ElementaryType)
-            and not isinstance(ir.lvalue, (ReferenceVariable, TemporaryVariable))
+            and not isinstance(ir.lvalue, (ReferenceVariable, TemporaryVariable, TupleVariable))
         ):
             if ir.lvalue.name == "_":
                 return