Add more functions to whitelist

Author: markshannon

Include/internal/pycore_opcode_metadata.h

@@ -5,7 +5,7 @@
 import parsing
 from typing import AbstractSet
 
-WHITELIST = (
+NON_ESCAPING_FUNCTIONS = (
     "Py_INCREF",
     "_PyDictOrValues_IsValues",
     "_PyObject_DictOrValuesPointer",
@@ -39,9 +39,20 @@
     "Py_NewRef",
     "_PyList_ITEMS",
     "_PyTuple_ITEMS",
+    "_PyList_AppendTakeRef",
+    "_Py_atomic_load_uintptr_relaxed",
+    "_PyFrame_GetCode",
 )
 
+ESCAPING_FUNCTIONS = (
+    "import_name",
+    "import_from",
+)
+
+
 def makes_escaping_api_call(instr: parsing.Node) -> bool:
+    if "CALL_INTRINSIC" in instr.name:
+        return True;
     tkns = iter(instr.tokens)
     for tkn in tkns:
         if tkn.kind != lx.IDENTIFIER:
@@ -52,6 +63,8 @@ def makes_escaping_api_call(instr: parsing.Node) -> bool:
             return False
         if next_tkn.kind != lx.LPAREN:
             continue
+        if tkn.text in ESCAPING_FUNCTIONS:
+            return True
         if not tkn.text.startswith("Py") and not tkn.text.startswith("_Py"):
             continue
         if tkn.text.endswith("Check"):
@@ -60,7 +73,7 @@ def makes_escaping_api_call(instr: parsing.Node) -> bool:
             continue
         if tkn.text.endswith("CheckExact"):
             continue
-        if tkn.text in WHITELIST:
+        if tkn.text in NON_ESCAPING_FUNCTIONS:
             continue
         return True
     return False
@@ -111,8 +124,7 @@ def fromInstruction(instr: parsing.Node) -> "InstructionFlags":
                 or variable_used(instr, "resume_with_error")
             ),
             HAS_ESCAPES_FLAG=(
-                variable_used(instr, "tstate")
-                or makes_escaping_api_call(instr)
+                makes_escaping_api_call(instr)
             ),
         )