Break down TO_BOOL_STR into guard and to-bool

python · brandtbucher · Mar 30, 2025 · Mar 26, 2025 · Mar 26, 2025 · Mar 26, 2025
commit ddcb309455e38be365e2d421f8df50b173035d50
diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h
diff --git a/Include/internal/pycore_uop_ids.h b/Include/internal/pycore_uop_ids.h
diff --git a/Include/internal/pycore_uop_metadata.h b/Include/internal/pycore_uop_metadata.h
@@ -512,10 +512,14 @@ dummy_func(
            res = PyStackRef_False;
        }

-        inst(TO_BOOL_STR, (unused/1, unused/2, value -- res)) {
+        op(_GUARD_TOS_UNICODE, (value-- value)) {
            PyObject *value_o = PyStackRef_AsPyObjectBorrow(value);
            EXIT_IF(!PyUnicode_CheckExact(value_o));
+        }
+
+        op(_TO_BOOL_STR, (value-- res)) {
            STAT_INC(TO_BOOL, hit);
+            PyObject* value_o = PyStackRef_AsPyObjectBorrow(value);
            if (value_o == &_Py_STR(empty)) {
                assert(_Py_IsImmortal(value_o));
                DEAD(value);
@@ -528,6 +532,9 @@ dummy_func(
            }
        }

+        macro(TO_BOOL_STR) =
+            _GUARD_TOS_UNICODE + unused / 1 + unused / 2 + _TO_BOOL_STR;
+
        op(_REPLACE_WITH_TRUE, (value -- res)) {
            PyStackRef_CLOSE(value);
            res = PyStackRef_True;

diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
-Original file line number
+Diff line change
@@ -512,10 +512,14 @@ dummy_func(
                 res = PyStackRef_False;
             }
-            inst(TO_BOOL_STR, (unused/1, unused/2, value -- res)) {
+            op(_GUARD_TOS_UNICODE, (value-- value)) {
                   brandtbucher marked this conversation as resolved.
              

          
            Show resolved
            Hide resolved
        

                
  
            
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.
                 PyObject *value_o = PyStackRef_AsPyObjectBorrow(value);
                 EXIT_IF(!PyUnicode_CheckExact(value_o));
+            }
+            op(_TO_BOOL_STR, (value-- res)) {
                   brandtbucher marked this conversation as resolved.
              

          
            Show resolved
            Hide resolved
        

                
  
            
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.
                 STAT_INC(TO_BOOL, hit);
+                PyObject* value_o = PyStackRef_AsPyObjectBorrow(value);
                   brandtbucher marked this conversation as resolved.
              

          
            Show resolved
            Hide resolved
        

                
  
            
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.
                 if (value_o == &_Py_STR(empty)) {
                     assert(_Py_IsImmortal(value_o));
                     DEAD(value);
@@ -528,6 +532,9 @@ dummy_func(
                 }
             }
+            macro(TO_BOOL_STR) =
+                _GUARD_TOS_UNICODE + unused / 1 + unused / 2 + _TO_BOOL_STR;
                   brandtbucher marked this conversation as resolved.
              

          
            Show resolved
            Hide resolved
        

                
  
            
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.
             op(_REPLACE_WITH_TRUE, (value -- res)) {
                 PyStackRef_CLOSE(value);
                 res = PyStackRef_True;
-          Expand Down