gh-133157: remove usage of _Py_NO_SANITIZE_UNDEFINED in Parser/pegen.c (#134048)
Some checks are pending
Tests / (push) Blocked by required conditions
Tests / Change detection (push) Waiting to run
Tests / Docs (push) Blocked by required conditions
Tests / Check if Autoconf files are up to date (push) Blocked by required conditions
Tests / Windows MSI (push) Blocked by required conditions
Tests / WASI (push) Blocked by required conditions
Tests / Hypothesis tests on Ubuntu (push) Blocked by required conditions
Tests / Address sanitizer (push) Blocked by required conditions
Tests / Check if generated files are up to date (push) Blocked by required conditions
Tests / Ubuntu SSL tests with OpenSSL (push) Blocked by required conditions
Tests / Cross build Linux (push) Blocked by required conditions
Tests / CIFuzz (push) Blocked by required conditions
Tests / All required checks pass (push) Blocked by required conditions
Lint / lint (push) Waiting to run
mypy / Run mypy on Lib/_pyrepl (push) Waiting to run
mypy / Run mypy on Lib/test/libregrtest (push) Waiting to run
mypy / Run mypy on Lib/tomllib (push) Waiting to run
mypy / Run mypy on Tools/build (push) Waiting to run
mypy / Run mypy on Tools/cases_generator (push) Waiting to run
mypy / Run mypy on Tools/clinic (push) Waiting to run
mypy / Run mypy on Tools/jit (push) Waiting to run
mypy / Run mypy on Tools/peg_generator (push) Waiting to run

This commit is contained in:
Bénédikt Tran 2025-06-10 02:08:30 +02:00 committed by GitHub
parent 49fc1f215a
commit 754e7c9b51
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 118 additions and 113 deletions

View file

@ -214,33 +214,47 @@ class CCallMakerVisitor(GrammarVisitor):
call.assigned_variable_type = node.type
return call
def assert_no_undefined_behavior(
self, call: FunctionCall, wrapper: str, expected_rtype: str | None,
) -> None:
if call.return_type != expected_rtype:
raise RuntimeError(
f"{call.function} return type is incompatible with {wrapper}: "
f"expect: {expected_rtype}, actual: {call.return_type}"
)
def lookahead_call_helper(self, node: Lookahead, positive: int) -> FunctionCall:
call = self.generate_call(node.node)
if call.nodetype == NodeTypes.NAME_TOKEN:
return FunctionCall(
function=f"_PyPegen_lookahead_with_name",
arguments=[positive, call.function, *call.arguments],
return_type="int",
)
comment = None
if call.nodetype is NodeTypes.NAME_TOKEN:
function = "_PyPegen_lookahead_for_expr"
self.assert_no_undefined_behavior(call, function, "expr_ty")
elif call.nodetype is NodeTypes.STRING_TOKEN:
# _PyPegen_string_token() returns 'void *' instead of 'Token *';
# in addition, the overall function call would return 'expr_ty'.
assert call.function == "_PyPegen_string_token"
function = "_PyPegen_lookahead"
self.assert_no_undefined_behavior(call, function, "expr_ty")
elif call.nodetype == NodeTypes.SOFT_KEYWORD:
return FunctionCall(
function=f"_PyPegen_lookahead_with_string",
arguments=[positive, call.function, *call.arguments],
return_type="int",
)
function = "_PyPegen_lookahead_with_string"
self.assert_no_undefined_behavior(call, function, "expr_ty")
elif call.nodetype in {NodeTypes.GENERIC_TOKEN, NodeTypes.KEYWORD}:
return FunctionCall(
function=f"_PyPegen_lookahead_with_int",
arguments=[positive, call.function, *call.arguments],
return_type="int",
comment=f"token={node.node}",
)
function = "_PyPegen_lookahead_with_int"
self.assert_no_undefined_behavior(call, function, "Token *")
comment = f"token={node.node}"
elif call.return_type == "expr_ty":
function = "_PyPegen_lookahead_for_expr"
elif call.return_type == "stmt_ty":
function = "_PyPegen_lookahead_for_stmt"
else:
return FunctionCall(
function=f"_PyPegen_lookahead",
arguments=[positive, f"(void *(*)(Parser *)) {call.function}", *call.arguments],
return_type="int",
)
function = "_PyPegen_lookahead"
self.assert_no_undefined_behavior(call, function, None)
return FunctionCall(
function=function,
arguments=[positive, call.function, *call.arguments],
return_type="int",
comment=comment,
)
def visit_PositiveLookahead(self, node: PositiveLookahead) -> FunctionCall:
return self.lookahead_call_helper(node, 1)