Some touches

Author: ilevkivskyi

mypy/test/testcheck.py

@@ -10,11 +10,8 @@
 
 from mypy import build
 from mypy.build import Graph
-from mypy.cache import Buffer
 from mypy.errors import CompileError
-from mypy.fixup import fixup_module
 from mypy.modulefinder import BuildSource, FindModuleCache, SearchPaths
-from mypy.nodes import MypyFile
 from mypy.test.config import test_data_prefix, test_temp_dir
 from mypy.test.data import DataDrivenTestCase, DataSuite, FileOperation, module_from_path
 from mypy.test.helpers import (
@@ -257,19 +254,6 @@ def verify_cache(
         with open(cachedir_tag) as f:
             assert f.read().startswith("Signature: 8a477f597d28d172789f06886806bc55")
 
-        # Also validate new cache format works correctly
-        for id in graph:
-            tree = graph[id].tree
-            if not tree:
-                continue
-            data = Buffer()
-            tree.write(data)
-            new_data = Buffer()
-            new_tree = MypyFile.read(Buffer(data.getvalue()))
-            fixup_module(new_tree, manager.modules, False)
-            new_tree.write(new_data)
-            assert data.getvalue() == new_data.getvalue()
-
     def find_error_message_paths(self, a: list[str]) -> set[str]:
         hits = set()
         for line in a:

mypy/typeshed/stubs/mypy-native/METADATA.toml

@@ -0,0 +1 @@
+version = "0.0.*"

mypy/typeshed/stubs/mypy-native/native_internal.pyi

@@ -0,0 +1,12 @@
+class Buffer:
+    def __init__(self, source: bytes = ...) -> None: ...
+    def getvalue(self) -> bytes: ...
+
+def write_bool(data: Buffer, value: bool) -> None: ...
+def read_bool(data: Buffer) -> bool: ...
+def write_str(data: Buffer, value: str) -> None: ...
+def read_str(data: Buffer) -> str: ...
+def write_float(data: Buffer, value: float) -> None: ...
+def read_float(data: Buffer) -> float: ...
+def write_int(data: Buffer, value: int) -> None: ...
+def read_int(data: Buffer) -> int: ...

mypyc/analysis/ircheck.py

@@ -182,7 +182,7 @@ def check_op_sources_valid(fn: FuncIR) -> list[FnError]:
     set_rprimitive.name,
     tuple_rprimitive.name,
     range_rprimitive.name,
-} | set(KNOWN_NATIVE_TYPES.values())
+} | set(KNOWN_NATIVE_TYPES)
 
 
 def can_coerce_to(src: RType, dest: RType) -> bool:

mypyc/lib-rt/native_internal.c

@@ -268,6 +268,8 @@ write_str_internal(PyObject *data, PyObject *value) {
     if (!chunk)
         return 2;
     if (size > MAX_STR_SIZE) {
+        // This is a micro-optimization to reduce cache size, if someone
+        // will complain about their 65K-long string literals we can adjust.
         PyErr_Format(
             PyExc_OverflowError,
             "cannot store string longer than %d bytes",
@@ -379,6 +381,7 @@ read_int_internal(PyObject *data) {
     ((BufferObject *)data)->pos += sizeof(CPyTagged);
     if ((ret & CPY_INT_TAG) == 0)
         return ret;
+    // People who have literal ints not fitting in size_t should be punished :-)
     PyObject *str_ret = read_str_internal(data);
     if (str_ret == NULL)
         return CPY_INT_TAG;
@@ -487,7 +490,7 @@ native_internal_module_exec(PyObject *m)
         (void *)read_float_internal,
         (void *)write_int_internal,
         (void *)read_int_internal,
-        (void *)&NativeInternal_ABI_Version,
+        (void *)NativeInternal_ABI_Version,
     };
     PyObject *c_api_object = PyCapsule_New((void *)NativeInternal_API, "native_internal._C_API", NULL);
     if (PyModule_Add(m, "_C_API", c_api_object) < 0) {

mypyc/lib-rt/setup.py

@@ -80,13 +80,7 @@ def run(self):
         ext_modules=[
             Extension(
                 "native_internal",
-                [
-                    "native_internal.c",
-                    "init.c",
-                    "int_ops.c",
-                    "exc_ops.c",
-                    "pythonsupport.c",
-                ],
+                ["native_internal.c", "init.c", "int_ops.c", "exc_ops.c", "pythonsupport.c"],
                 include_dirs=["."],
                 **kwargs,
             )