Skip to content

Support for Python 3.12 #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
tonybaloney wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Support for Python 3.12 #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d16af9
Switch on the removed opcodes for 3.12+
tonybaloney Apr 26, 2023
acb3755
Update version filter
tonybaloney Apr 26, 2023
2f78f43
Don't use JUMP_IF_TRUE_OR_POP or JUMP_IF_FALSE_OR_POP in 3.12+
tonybaloney Apr 27, 2023
cd5c6a9
Update version deps. There is no PRECALL anymore
tonybaloney Apr 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/native/codetable_gen.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,10 @@ static bool dummy_initializer = []() {
opcode_caches[COMPARE_OP] = 2;
opcode_caches[LOAD_GLOBAL] = 5;
opcode_caches[BINARY_OP] = 1;
#if PY_MAJOR_VERSION >= 3 && PY_MINOR_VERSION == 11
opcode_caches[LOAD_METHOD] = 10;
opcode_caches[PRECALL] = 1;
#endif
opcode_caches[CALL] = 4;
return true;
}();
Expand Down
16 changes: 9 additions & 7 deletions src/version_dependent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.
"""This module manages the version specific aspects of bytecode instrumentation.

Accross Python versions there are variations in:
Across Python versions there are variations in:
- Instructions
- Instruction arguments
- Shape of a code object
Expand All @@ -37,10 +37,10 @@

PYTHON_VERSION = sys.version_info[:2]

if PYTHON_VERSION < (3, 6) or PYTHON_VERSION > (3, 11):
if PYTHON_VERSION < (3, 6) or PYTHON_VERSION > (3, 12):
raise RuntimeError(
"You are fuzzing on an unsupported python version: "
+ f"{PYTHON_VERSION[0]}.{PYTHON_VERSION[1]}. Only 3.6 - 3.11 are "
+ f"{PYTHON_VERSION[0]}.{PYTHON_VERSION[1]}. Only 3.6 - 3.12 are "
+ "supported by atheris 2.0. Use atheris 1.0 for older python versions."
)

Expand Down Expand Up @@ -139,7 +139,7 @@
"JUMP_IF_TRUE_OR_POP",
"JUMP_IF_FALSE_OR_POP",
])
else:
elif PYTHON_VERSION < (3, 12):
HAVE_REL_REFERENCE.extend([
"JUMP_IF_TRUE_OR_POP",
"JUMP_IF_FALSE_OR_POP",
Expand Down Expand Up @@ -328,7 +328,7 @@ def get_lnotab(code, listing):
return bytes(lnotab)


if (3, 11) <= PYTHON_VERSION <= (3, 11):
if (3, 11) <= PYTHON_VERSION:
from .native import _generate_codetable
def get_lnotab(code, listing):
ret = _generate_codetable(code, listing)
Expand Down Expand Up @@ -391,7 +391,7 @@ def parse_exceptiontable(code):
return ExceptionTable([])


if (3, 11) <= PYTHON_VERSION <= (3, 11):
if (3, 11) <= PYTHON_VERSION:
from .native import _generate_exceptiontable

def generate_exceptiontable(original_code, exception_table_entries):
Expand Down Expand Up @@ -520,14 +520,16 @@ def args_terminator():
# 3.11 requires a PRECALL instruction prior to every CALL instruction.
def call(argc: int):
ret = []
ret.append((dis.opmap["PRECALL"], argc))
if PYTHON_VERSION == (3, 11):
ret.append((dis.opmap["PRECALL"], argc))
ret.append((dis.opmap["CALL"], argc))
return ret

# A call pops 2 items off the stack in addition to the args: the callable
# itself, and a null terminator.
CALLABLE_STACK_ENTRIES = 2


### disassembler compatibility ###
# In 3.11, we need to pass show_caches=True.

Expand Down