From 6620bc926e7d8435256bf9bf0c774c22e0302241 Mon Sep 17 00:00:00 2001
From: Simone <79767264+smonicas@users.noreply.github.com>
Date: Tue, 6 Feb 2024 14:54:04 +0100
Subject: [PATCH] Fix using for when used with "this" (#2224)

---
 slither/slithir/convert.py                    |  23 ++++++++++++++++++
 tests/e2e/solc_parsing/test_ast_parsing.py    |   1 +
 ...g-for-this-contract.sol-0.8.15-compact.zip | Bin 0 -> 2745 bytes
 ...-for-this-contract.sol-0.8.15-compact.json |   8 ++++++
 .../test_data/using-for-this-contract.sol     |  13 ++++++++++
 5 files changed, 45 insertions(+)
 create mode 100644 tests/e2e/solc_parsing/test_data/compile/using-for-this-contract.sol-0.8.15-compact.zip
 create mode 100644 tests/e2e/solc_parsing/test_data/expected/using-for-this-contract.sol-0.8.15-compact.json
 create mode 100644 tests/e2e/solc_parsing/test_data/using-for-this-contract.sol

diff --git a/slither/slithir/convert.py b/slither/slithir/convert.py
index 4411e3505c..170df8cba9 100644
--- a/slither/slithir/convert.py
+++ b/slither/slithir/convert.py
@@ -630,6 +630,17 @@ def propagate_types(ir: Operation, node: "Node"):  # pylint: disable=too-many-lo
                     if new_ir:
                         return new_ir
 
+                # convert library function when used with "this"
+                if (
+                    isinstance(t, ElementaryType)
+                    and t.name == "address"
+                    and ir.destination.name == "this"
+                    and UserDefinedType(node_function.contract) in using_for
+                ):
+                    new_ir = convert_to_library_or_top_level(ir, node, using_for)
+                    if new_ir:
+                        return new_ir
+
                 if isinstance(t, UserDefinedType):
                     # UserdefinedType
                     t_type = t.type
@@ -1564,6 +1575,18 @@ def convert_to_library_or_top_level(
         if new_ir:
             return new_ir
 
+    if (
+        isinstance(t, ElementaryType)
+        and t.name == "address"
+        and ir.destination.name == "this"
+        and UserDefinedType(node.function.contract) in using_for
+    ):
+        new_ir = look_for_library_or_top_level(
+            contract, ir, using_for, UserDefinedType(node.function.contract)
+        )
+        if new_ir:
+            return new_ir
+
     return None
 
 
diff --git a/tests/e2e/solc_parsing/test_ast_parsing.py b/tests/e2e/solc_parsing/test_ast_parsing.py
index bc57dc51b5..e233fa993b 100644
--- a/tests/e2e/solc_parsing/test_ast_parsing.py
+++ b/tests/e2e/solc_parsing/test_ast_parsing.py
@@ -448,6 +448,7 @@ def make_version(minor: int, patch_min: int, patch_max: int) -> List[str]:
     Test("using-for-functions-list-3-0.8.0.sol", ["0.8.15"]),
     Test("using-for-functions-list-4-0.8.0.sol", ["0.8.15"]),
     Test("using-for-global-0.8.0.sol", ["0.8.15"]),
+    Test("using-for-this-contract.sol", ["0.8.15"]),
     Test("library_event-0.8.16.sol", ["0.8.16"]),
     Test("top-level-struct-0.8.0.sol", ["0.8.0"]),
     Test("yul-top-level-0.8.0.sol", ["0.8.0"]),
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-this-contract.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-this-contract.sol-0.8.15-compact.zip
new file mode 100644
index 0000000000000000000000000000000000000000..6950666a479e8b3c138633675a65c8f101cd0069
GIT binary patch
literal 2745
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

literal 0
HcmV?d00001

diff --git a/tests/e2e/solc_parsing/test_data/expected/using-for-this-contract.sol-0.8.15-compact.json b/tests/e2e/solc_parsing/test_data/expected/using-for-this-contract.sol-0.8.15-compact.json
new file mode 100644
index 0000000000..43eca2c9a9
--- /dev/null
+++ b/tests/e2e/solc_parsing/test_data/expected/using-for-this-contract.sol-0.8.15-compact.json
@@ -0,0 +1,8 @@
+{
+  "Lib": {
+    "f(Hello)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n}\n"
+  },
+  "Hello": {
+    "test()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n}\n"
+  }
+}
\ No newline at end of file
diff --git a/tests/e2e/solc_parsing/test_data/using-for-this-contract.sol b/tests/e2e/solc_parsing/test_data/using-for-this-contract.sol
new file mode 100644
index 0000000000..33bbc74cdc
--- /dev/null
+++ b/tests/e2e/solc_parsing/test_data/using-for-this-contract.sol
@@ -0,0 +1,13 @@
+library Lib {
+  function f(Hello h) external {
+
+  }
+}
+contract Hello {
+    using Lib for Hello;
+
+    function test() external {
+      this.f();
+    }
+}
+