From 80b6b5829c48299b16ab0d05ac3c4a1b9666abba Mon Sep 17 00:00:00 2001
From: BobTheBuidler <bobthebuidlerdefi@gmail.com>
Date: Wed, 1 Oct 2025 23:51:16 +0000
Subject: [PATCH 1/4] [mypyc] feat: support constant folding in
 `IRBuilder.extract_int`

---
 mypyc/irbuild/builder.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/mypyc/irbuild/builder.py b/mypyc/irbuild/builder.py
index 125382145991..28696b3a6241 100644
--- a/mypyc/irbuild/builder.py
+++ b/mypyc/irbuild/builder.py
@@ -106,6 +106,7 @@
     object_rprimitive,
     str_rprimitive,
 )
+from mypyc.irbuild.constant_fold import constant_fold_expr
 from mypyc.irbuild.context import FuncInfo, ImplicitClass
 from mypyc.irbuild.ll_builder import LowLevelIRBuilder
 from mypyc.irbuild.mapper import Mapper
@@ -965,12 +966,8 @@ def maybe_spill_assignable(self, value: Value) -> Register | AssignmentTarget:
         return reg
 
     def extract_int(self, e: Expression) -> int | None:
-        if isinstance(e, IntExpr):
-            return e.value
-        elif isinstance(e, UnaryExpr) and e.op == "-" and isinstance(e.expr, IntExpr):
-            return -e.expr.value
-        else:
-            return None
+        folded = constant_fold_expr(self, e)
+        return folded if isinstance(folded, int) else None
 
     def get_sequence_type(self, expr: Expression) -> RType:
         return self.get_sequence_type_from_type(self.types[expr])

From 76056866cabbd6a744a9138746da0dc99e05df7a Mon Sep 17 00:00:00 2001
From: BobTheBuidler <70677534+BobTheBuidler@users.noreply.github.com>
Date: Wed, 1 Oct 2025 20:06:02 -0400
Subject: [PATCH 2/4] Update constant_fold.py

---
 mypyc/irbuild/constant_fold.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mypyc/irbuild/constant_fold.py b/mypyc/irbuild/constant_fold.py
index 12a4b15dd40c..10a0de533306 100644
--- a/mypyc/irbuild/constant_fold.py
+++ b/mypyc/irbuild/constant_fold.py
@@ -10,7 +10,7 @@
 
 from __future__ import annotations
 
-from typing import Final, Union
+from typing import TYPE_CHECKING, Final, Union
 
 from mypy.constant_fold import constant_fold_binary_op, constant_fold_unary_op
 from mypy.nodes import (
@@ -26,15 +26,16 @@
     UnaryExpr,
     Var,
 )
-from mypyc.irbuild.builder import IRBuilder
 from mypyc.irbuild.util import bytes_from_str
+if TYPE_CHECKING:
+    from mypyc.irbuild.builder import IRBuilder
 
 # All possible result types of constant folding
 ConstantValue = Union[int, float, complex, str, bytes]
 CONST_TYPES: Final = (int, float, complex, str, bytes)
 
 
-def constant_fold_expr(builder: IRBuilder, expr: Expression) -> ConstantValue | None:
+def constant_fold_expr(builder: "IRBuilder", expr: Expression) -> ConstantValue | None:
     """Return the constant value of an expression for supported operations.
 
     Return None otherwise.

From b49dfda23394f5c441949d112bb775bb88df9c64 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Thu, 2 Oct 2025 00:07:00 +0000
Subject: [PATCH 3/4] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 mypyc/irbuild/builder.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mypyc/irbuild/builder.py b/mypyc/irbuild/builder.py
index 28696b3a6241..63930123135f 100644
--- a/mypyc/irbuild/builder.py
+++ b/mypyc/irbuild/builder.py
@@ -40,7 +40,6 @@
     TypeAlias,
     TypeInfo,
     TypeParam,
-    UnaryExpr,
     Var,
 )
 from mypy.types import (

From d470c509067c25c4d699745731a14d2841168ad1 Mon Sep 17 00:00:00 2001
From: BobTheBuidler <70677534+BobTheBuidler@users.noreply.github.com>
Date: Wed, 1 Oct 2025 22:06:07 -0400
Subject: [PATCH 4/4] lint

---
 mypyc/irbuild/constant_fold.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mypyc/irbuild/constant_fold.py b/mypyc/irbuild/constant_fold.py
index 10a0de533306..b1133f95b18e 100644
--- a/mypyc/irbuild/constant_fold.py
+++ b/mypyc/irbuild/constant_fold.py
@@ -27,6 +27,7 @@
     Var,
 )
 from mypyc.irbuild.util import bytes_from_str
+
 if TYPE_CHECKING:
     from mypyc.irbuild.builder import IRBuilder
 
@@ -35,7 +36,7 @@
 CONST_TYPES: Final = (int, float, complex, str, bytes)
 
 
-def constant_fold_expr(builder: "IRBuilder", expr: Expression) -> ConstantValue | None:
+def constant_fold_expr(builder: IRBuilder, expr: Expression) -> ConstantValue | None:
     """Return the constant value of an expression for supported operations.
 
     Return None otherwise.