pytorch
diff --git a/‎test/dynamo/test_ctx_manager.py
Lines changed: 2 additions & 4 deletions b/‎test/dynamo/test_ctx_manager.py
Lines changed: 2 additions & 4 deletions
diff --git a/‎test/dynamo/test_exitstack.py
Lines changed: 58 additions & 1 deletion b/‎test/dynamo/test_exitstack.py
Lines changed: 58 additions & 1 deletion
diff --git a/‎test/dynamo_expected_failures/CPython313-test_contextlib-TestSuppress.test_cm_is_reentrant b/‎test/dynamo_expected_failures/CPython313-test_contextlib-TestSuppress.test_cm_is_reentrant
diff --git a/‎test/dynamo_expected_failures/CPython313-test_contextlib-TestSuppress.test_exception_hierarchy b/‎test/dynamo_expected_failures/CPython313-test_contextlib-TestSuppress.test_exception_hierarchy
diff --git a/‎test/dynamo_expected_failures/CPython313-test_contextlib-TestSuppress.test_instance_docs b/‎test/dynamo_expected_failures/CPython313-test_contextlib-TestSuppress.test_instance_docs
diff --git a/‎test/dynamo_expected_failures/CPython313-test_contextlib-TestSuppress.test_no_args b/‎test/dynamo_expected_failures/CPython313-test_contextlib-TestSuppress.test_no_args
diff --git a/‎test/dynamo_expected_failures/CPython313-test_contextlib-TestSuppress.test_no_exception b/‎test/dynamo_expected_failures/CPython313-test_contextlib-TestSuppress.test_no_exception
diff --git a/‎test/dynamo_expected_failures/CPython313-test_contextlib-TestSuppress.test_no_result_from_enter b/‎test/dynamo_expected_failures/CPython313-test_contextlib-TestSuppress.test_no_result_from_enter
diff --git a/‎test/dynamo_expected_failures/CPython313-test_contextlib-TestSuppress.test_other_exception b/‎test/dynamo_expected_failures/CPython313-test_contextlib-TestSuppress.test_other_exception
diff --git a/‎torch/_dynamo/variables/lists.py
Lines changed: 15 additions & 12 deletions b/‎torch/_dynamo/variables/lists.py
Lines changed: 15 additions & 12 deletions
@@ -2637,17 +2637,15 @@ def f(x):
         self.assertEqual(expected, out)
         self.assertEqual(len(eager.graphs), 2)
 
-    @parametrize("name", ("suppress", "stdout", "stderr"))
+    @parametrize("name", ("stdout", "stderr"))
     def test_contextlib_suppress(self, name):
         counters.clear()
         eager = EagerAndRecordGraphs()
 
         def fn(t):
             y = t.sin()
             # ensure we graph break on the suppress call below
-            if name == "suppress":
-                ctx = contextlib.suppress(ValueError)
-            elif name == "stdout":
+            if name == "stdout":
                 ctx = contextlib.redirect_stdout(sys.stderr)
             else:
                 ctx = contextlib.redirect_stderr(sys.stdout)
 
@@ -3,7 +3,7 @@
 import sys
 import traceback
 import unittest
-from contextlib import contextmanager, ExitStack
+from contextlib import contextmanager, ExitStack, suppress
 
 import torch
 import torch._dynamo.test_case
@@ -602,6 +602,63 @@ class CPythonTestExitStack(
     ]
 
 
+class CPythonTestSuppress(torch._dynamo.test_case.CPythonTestCase):
+    # Tests taken from CPython source code in cpython/Lib/test/test_contextlib.py
+    # https://github.com/python/cpython/blob/v3.13.1/Lib/test/test_contextlib.py
+    @make_dynamo_test
+    def test_no_result_from_enter(self):
+        with suppress(ValueError) as enter_result:
+            self.assertIsNone(enter_result)
+
+    @make_dynamo_test
+    def test_no_exception(self):
+        with suppress(ValueError):
+            self.assertEqual(pow(2, 5), 32)
+
+    @make_dynamo_test
+    def test_exact_exception(self):
+        with suppress(TypeError):
+            raise TypeError
+
+    @make_dynamo_test
+    def test_exception_hierarchy(self):
+        with suppress(LookupError):
+            "Hello"[50]
+
+    @make_dynamo_test
+    def test_other_exception(self):
+        with self.assertRaises(ZeroDivisionError):
+            with suppress(TypeError):
+                raise ZeroDivisionError
+
+    @make_dynamo_test
+    def test_no_args(self):
+        with self.assertRaises(ZeroDivisionError):
+            with suppress():  # noqa: B022
+                raise ZeroDivisionError
+
+    @make_dynamo_test
+    def test_multiple_exception_args(self):
+        with suppress(ZeroDivisionError, TypeError):
+            raise ZeroDivisionError
+        with suppress(ZeroDivisionError, TypeError):
+            raise TypeError
+
+    @make_dynamo_test
+    def test_cm_is_reentrant(self):
+        ignore_exceptions = suppress(Exception)
+        with ignore_exceptions:
+            pass
+        with ignore_exceptions:
+            raise TypeError
+        with ignore_exceptions:
+            with ignore_exceptions:  # Check nested usage
+                raise ValueError
+            outer_continued = True
+            {}[1]
+        self.assertTrue(outer_continued)
+
+
 if __name__ == "__main__":
     from torch._dynamo.test_case import run_tests
 
 
@@ -529,19 +529,22 @@ def call_method(
                     hints=["Use something else as the key."],
                 )
 
-            tx.output.side_effects.mutation(self)
-            sorted_items_with_keys = sorted(
-                (
+            try:
+                tx.output.side_effects.mutation(self)
+                sorted_items_with_keys = sorted(
                     (
-                        x,
-                        k.as_python_constant(),
-                        -i if reverse else i,  # extra key to ensure stable sort
-                    )
-                    for i, (k, x) in enumerate(zip(keys, self.items))
-                ),
-                key=operator.itemgetter(1, 2),
-                reverse=reverse,
-            )
+                        (
+                            x,
+                            k.as_python_constant(),
+                            -i if reverse else i,  # extra key to ensure stable sort
+                        )
+                        for i, (k, x) in enumerate(zip(keys, self.items))
+                    ),
+                    key=operator.itemgetter(1, 2),
+                    reverse=reverse,
+                )
+            except Exception as e:
+                raise_observed_exception(type(e), tx, args=[ConstantVariable(a) for a in e.args])
             self.items[:] = [x for x, *_ in sorted_items_with_keys]
             return ConstantVariable.create(None)