python · markshannon · Jun 7, 2021 · markshannon · Jun 7, 2021 · markshannon
diff --git a/Python/specialize.c b/Python/specialize.c
diff --git a/Objects/codeobject.c b/Objects/codeobject.c
diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
diff --git a/Python/specialize.c b/Python/specialize.c
diff --git a/Python/specialize.c b/Python/specialize.c
diff --git a/Python/specialize.c b/Python/specialize.c
diff --git a/Include/cpython/code.h b/Include/cpython/code.h
diff --git a/Include/cpython/code.h b/Include/cpython/code.h
diff --git a/Include/cpython/code.h b/Include/cpython/code.h
diff --git a/Include/cpython/code.h b/Include/cpython/code.h
diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-05-20-12-43-04.bpo-44187.3lk0L1.rst b/Misc/NEWS.d/next/Core and Builtins/2021-05-20-12-43-04.bpo-44187.3lk0L1.rst
diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
diff --git a/Python/ceval.c b/Python/ceval.c
diff --git a/Python/specialize.c b/Python/specialize.c
diff --git a/Python/specialize.c b/Python/specialize.c
diff --git a/Python/specialize.c b/Python/specialize.c
diff --git a/Python/specialize.c b/Python/specialize.c
+static uint8_t adaptive[256] = { 0 };
+
+static uint8_t cache_requirements[256] = { 0 };
diff --git a/Python/specialize.c b/Python/specialize.c
+            cache_offset = i/2;
+        }
+        else if (oparg > 255) {
+            /* Cannot access required cache_offset */
diff --git a/Python/specialize.c b/Python/specialize.c
diff --git a/Python/specialize.c b/Python/specialize.c
+            /* Cannot access required cache_offset */
+            continue;
+        }
+        cache_offset += need;
diff --git a/Python/specialize.c b/Python/specialize.c
diff --git a/Python/ceval.c b/Python/ceval.c
diff --git a/Python/ceval.c b/Python/ceval.c
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -1343,6 +1343,14 @@ eval_frame_handle_pending(PyThreadState *tstate)
 #define JUMPTO(x)       (next_instr = first_instr + (x))
 #define JUMPBY(x)       (next_instr += (x))

+/* Get opcode and opcode from original instructions, not quickened form. */
-/* Get opcode and opcode from original instructions, not quickened form. */
+/* Get opcode and oparg from original instructions, not quickened form. */
diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
+    return &last_cache_plus_one[-1-n].entry;
+}
+
+/* Following two functions determine the index of a cache entry from the
diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
diff --git a/Python/specialize.c b/Python/specialize.c
diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
diff --git a/Python/specialize.c b/Python/specialize.c
+ <instr 0> <instr 1> <instr 2> <instr 3>    <--- co->co_first_instr
+ <instr 4> <instr 5> <instr 6> <instr 7>
+ ...
+ <instr N-1>
diff --git a/Python/specialize.c b/Python/specialize.c
diff --git a/Python/specialize.c b/Python/specialize.c
+        }
+        previous_opcode = opcode;
+    }
+    return cache_offset+1;
-    return cache_offset+1;
+    return cache_offset + 1;  // One extra for the count entry
diff --git a/Python/specialize.c b/Python/specialize.c
+    }
+    Py_ssize_t size = PyBytes_GET_SIZE(code->co_code);
+    int instr_count = (int)(size/sizeof(_Py_CODEUNIT));
+    if (instr_count > MAX_SIZE_TO_QUICKEN) {
diff --git a/Lib/test/libregrtest/refleak.py b/Lib/test/libregrtest/refleak.py
@@ -73,9 +73,10 @@ def get_pooled_int(value):
    alloc_deltas = [0] * repcount
    fd_deltas = [0] * repcount
    getallocatedblocks = sys.getallocatedblocks
+    getallocatedblocks = sys.getallocatedblocks
		static uint8_t adaptive[256] = { 0 };

		static uint8_t cache_requirements[256] = { 0 };
	/* Get opcode and opcode from original instructions, not quickened form. */
	/* Get opcode and oparg from original instructions, not quickened form. */
	return cache_offset+1;
	return cache_offset + 1; // One extra for the count entry