pytorch · guilhermeleobas · May 6, 2025 · May 7, 2025 · May 7, 2025 · May 7, 2025
diff --git a/test/dynamo/test_functions.py b/test/dynamo/test_functions.py
@@ -1669,6 +1669,18 @@ def test_tuple_contains(a, b):
             return a + b
         return a - b
 
+    @make_test
+    def test_set_invalid_ConstantVariable_op(a, b):
+        s = set({"banana", "apple", "orange"})
+        try:
+            s - 1
+        except TypeError:
+            return a + b
+        except Exception:
+            return a - b
+        else:
+            return a * b
+
     @make_test
     def test_set_update_bytecode(x):
         # This produces bytecode SET_UPDATE since python 3.9

diff --git a/test/dynamo_expected_failures/CPython313-test_set-TestOnlySetsDict.test_difference b/test/dynamo_expected_failures/CPython313-test_set-TestOnlySetsDict.test_difference
diff --git a/...mo_expected_failures/CPython313-test_set-TestOnlySetsDict.test_difference_update_operator b/...mo_expected_failures/CPython313-test_set-TestOnlySetsDict.test_difference_update_operator
diff --git a/test/dynamo_expected_failures/CPython313-test_set-TestOnlySetsDict.test_ge_gt_le_lt b/test/dynamo_expected_failures/CPython313-test_set-TestOnlySetsDict.test_ge_gt_le_lt
diff --git a/test/dynamo_expected_failures/CPython313-test_set-TestOnlySetsDict.test_intersection b/test/dynamo_expected_failures/CPython313-test_set-TestOnlySetsDict.test_intersection
diff --git a/..._expected_failures/CPython313-test_set-TestOnlySetsDict.test_intersection_update_operator b/..._expected_failures/CPython313-test_set-TestOnlySetsDict.test_intersection_update_operator
diff --git a/...xpected_failures/CPython313-test_set-TestOnlySetsDict.test_sym_difference_update_operator b/...xpected_failures/CPython313-test_set-TestOnlySetsDict.test_sym_difference_update_operator
diff --git a/test/dynamo_expected_failures/CPython313-test_set-TestOnlySetsNumeric.test_difference b/test/dynamo_expected_failures/CPython313-test_set-TestOnlySetsNumeric.test_difference
diff --git a/...expected_failures/CPython313-test_set-TestOnlySetsNumeric.test_difference_update_operator b/...expected_failures/CPython313-test_set-TestOnlySetsNumeric.test_difference_update_operator
diff --git a/test/dynamo_expected_failures/CPython313-test_set-TestOnlySetsNumeric.test_ge_gt_le_lt b/test/dynamo_expected_failures/CPython313-test_set-TestOnlySetsNumeric.test_ge_gt_le_lt
diff --git a/test/dynamo_expected_failures/CPython313-test_set-TestOnlySetsNumeric.test_intersection b/test/dynamo_expected_failures/CPython313-test_set-TestOnlySetsNumeric.test_intersection
diff --git a/...pected_failures/CPython313-test_set-TestOnlySetsNumeric.test_intersection_update_operator b/...pected_failures/CPython313-test_set-TestOnlySetsNumeric.test_intersection_update_operator
diff --git a/...cted_failures/CPython313-test_set-TestOnlySetsNumeric.test_sym_difference_update_operator b/...cted_failures/CPython313-test_set-TestOnlySetsNumeric.test_sym_difference_update_operator
diff --git a/...xpected_failures/CPython313-test_set-TestOnlySetsOperator.test_difference_update_operator b/...xpected_failures/CPython313-test_set-TestOnlySetsOperator.test_difference_update_operator
diff --git a/...ected_failures/CPython313-test_set-TestOnlySetsOperator.test_intersection_update_operator b/...ected_failures/CPython313-test_set-TestOnlySetsOperator.test_intersection_update_operator
diff --git a/...ted_failures/CPython313-test_set-TestOnlySetsOperator.test_sym_difference_update_operator b/...ted_failures/CPython313-test_set-TestOnlySetsOperator.test_sym_difference_update_operator
diff --git a/..._expected_failures/CPython313-test_set-TestOnlySetsString.test_difference_update_operator b/..._expected_failures/CPython313-test_set-TestOnlySetsString.test_difference_update_operator
diff --git a/...xpected_failures/CPython313-test_set-TestOnlySetsString.test_intersection_update_operator b/...xpected_failures/CPython313-test_set-TestOnlySetsString.test_intersection_update_operator
diff --git a/...ected_failures/CPython313-test_set-TestOnlySetsString.test_sym_difference_update_operator b/...ected_failures/CPython313-test_set-TestOnlySetsString.test_sym_difference_update_operator
diff --git a/test/dynamo_expected_failures/CPython313-test_set-TestOnlySetsTuple.test_difference b/test/dynamo_expected_failures/CPython313-test_set-TestOnlySetsTuple.test_difference
diff --git a/...o_expected_failures/CPython313-test_set-TestOnlySetsTuple.test_difference_update_operator b/...o_expected_failures/CPython313-test_set-TestOnlySetsTuple.test_difference_update_operator
diff --git a/test/dynamo_expected_failures/CPython313-test_set-TestOnlySetsTuple.test_intersection b/test/dynamo_expected_failures/CPython313-test_set-TestOnlySetsTuple.test_intersection
diff --git a/...expected_failures/CPython313-test_set-TestOnlySetsTuple.test_intersection_update_operator b/...expected_failures/CPython313-test_set-TestOnlySetsTuple.test_intersection_update_operator
diff --git a/...pected_failures/CPython313-test_set-TestOnlySetsTuple.test_sym_difference_update_operator b/...pected_failures/CPython313-test_set-TestOnlySetsTuple.test_sym_difference_update_operator
diff --git a/test/dynamo_expected_failures/CPython313-test_set-TestSet.test_and b/test/dynamo_expected_failures/CPython313-test_set-TestSet.test_and
diff --git a/test/dynamo_expected_failures/CPython313-test_set-TestSet.test_sub b/test/dynamo_expected_failures/CPython313-test_set-TestSet.test_sub
diff --git a/test/dynamo_expected_failures/TestAutograd.test_gradcheck_forward_ad b/test/dynamo_expected_failures/TestAutograd.test_gradcheck_forward_ad
diff --git a/torch/_dynamo/variables/base.py b/torch/_dynamo/variables/base.py
@@ -22,7 +22,7 @@
 
 from .. import graph_break_hints, variables
 from ..current_scope_id import current_scope_id
-from ..exc import unimplemented_v2
+from ..exc import raise_observed_exception, unimplemented_v2
 from ..guards import GuardBuilder, install_guard
 from ..source import AttrSource, Source
 from ..utils import cmp_name_to_op_mapping, istype
@@ -515,11 +515,18 @@ def call_method(
                     hints=[],
                 )
 
-            return variables.ConstantVariable.create(
-                cmp_name_to_op_mapping[name](
-                    self.as_python_constant(), other.as_python_constant()
+            try:
+                return variables.ConstantVariable.create(
+                    cmp_name_to_op_mapping[name](
+                        self.as_python_constant(), other.as_python_constant()
+                    )
+                )
+            except Exception as e:
+                raise_observed_exception(
+                    type(e),
+                    tx,
+                    args=[list(map(variables.ConstantVariable.create, e.args))],
                 )
-            )
         hints = [
             f"Avoid calling `{self.python_type_name()}.{name}` in your code.",
             "Please report an issue to PyTorch.",

diff --git a/torch/_dynamo/variables/builtin.py b/torch/_dynamo/variables/builtin.py
@@ -57,7 +57,7 @@
     str_methods,
     tensortype_to_dtype,
 )
-from .base import ValueMutationNew, VariableTracker
+from .base import AsPythonConstantNotImplementedError, ValueMutationNew, VariableTracker
 from .constant import ConstantVariable
 from .ctx_manager import EventVariable, StreamVariable
 from .dicts import (
@@ -901,6 +901,12 @@ def constant_fold_handler(tx: "InstructionTranslator", args, kwargs):
                             *[x.as_python_constant() for x in args],
                         )
                     except Exception as exc:
+                        raise_observed_exception(
+                            type(exc),
+                            tx,
+                            args=list(map(ConstantVariable.create, exc.args)),
+                        )
+                    except AsPythonConstantNotImplementedError as exc:
                         unimplemented_v2(
                             gb_type="constant fold exception",
                             context=f"attempted to run function {fn} with arguments {args}",
@@ -922,14 +928,20 @@ def constant_fold_handler(tx: "InstructionTranslator", args, kwargs):
                                     k: v.as_python_constant() for k, v in kwargs.items()
                                 },
                             )
-                        except Exception as exc:
+                        except AsPythonConstantNotImplementedError as exc:
                             unimplemented_v2(
                                 gb_type="constant fold exception",
-                                context=f"attempted to run function {fn} with arguments {args} {kwargs}",
+                                context=f"attempted to run function {fn} with arguments {args}",
                                 explanation="Encountered exception when attempting to constant fold.",
                                 hints=[*graph_break_hints.DYNAMO_BUG],
                                 from_exc=exc,
                             )
+                        except Exception as exc:
+                            raise_observed_exception(
+                                type(exc),
+                                tx,
+                                args=list(map(ConstantVariable.create, exc.args)),
+                            )
                         return VariableTracker.build(tx, res)
 
             handlers.append(constant_fold_handler)

diff --git a/torch/_dynamo/variables/constant.py b/torch/_dynamo/variables/constant.py
@@ -190,7 +190,12 @@ def call_method(
                     )
                     return SymNodeVariable.create(tx, proxy, add_target)
                 else:
-                    return ConstantVariable.create(op(self.value, add_target))
+                    try:
+                        return ConstantVariable.create(op(self.value, add_target))
+                    except Exception as e:
+                        raise_observed_exception(
+                            type(e), tx, args=list(map(ConstantVariable.create, e.args))
+                        )
         elif isinstance(self.value, bytes) and name == "decode":
             method = getattr(self.value, name)
             return ConstantVariable.create(method(*const_args, **const_kwargs))

diff --git a/torch/_dynamo/variables/higher_order_ops.py b/torch/_dynamo/variables/higher_order_ops.py
@@ -46,6 +46,7 @@
 from .. import graph_break_hints, variables
 from ..exc import (
     IncorrectUsage,
+    ObservedException,
     UncapturedHigherOrderOpError,
     unimplemented,
     unimplemented_v2,
@@ -72,7 +73,7 @@ def deco(fn):
         def graph_break_as_hard_error(*args, **kwargs):
             try:
                 return fn(*args, **kwargs)
-            except Unsupported as e:
+            except (Unsupported, ObservedException) as e:
                 msg = " Scroll up to find out what causes the graph break."
                 raise UncapturedHigherOrderOpError(reason + msg) from e