From 48d829799737ebc838b79244e8d59f2e12247e79 Mon Sep 17 00:00:00 2001 From: Ivy Xu Date: Sat, 13 Jun 2026 21:56:57 +0800 Subject: [PATCH 1/4] Remove unused imports from `Tools/` --- Tools/c-analyzer/c_parser/preprocessor/clang.py | 1 - Tools/c-analyzer/c_parser/preprocessor/common.py | 1 - Tools/c-analyzer/distutils/util.py | 1 - Tools/cases_generator/generators_common.py | 2 -- Tools/cases_generator/opcode_metadata_generator.py | 1 - Tools/cases_generator/parser.py | 1 - Tools/cases_generator/tier1_generator.py | 6 ------ Tools/inspection/benchmark_external_inspection.py | 1 - Tools/jit/_stencils.py | 1 - Tools/peg_generator/pegen/grammar_parser.py | 6 +----- Tools/picklebench/memory_dos_impact.py | 4 +--- 11 files changed, 2 insertions(+), 23 deletions(-) diff --git a/Tools/c-analyzer/c_parser/preprocessor/clang.py b/Tools/c-analyzer/c_parser/preprocessor/clang.py index 574a23f8f6d6f9..738c261d1ecd80 100644 --- a/Tools/c-analyzer/c_parser/preprocessor/clang.py +++ b/Tools/c-analyzer/c_parser/preprocessor/clang.py @@ -1,5 +1,4 @@ import os.path -import re, sys from . import common as _common from . import gcc as _gcc diff --git a/Tools/c-analyzer/c_parser/preprocessor/common.py b/Tools/c-analyzer/c_parser/preprocessor/common.py index 06f8f4da62b224..3e557987c30cb2 100644 --- a/Tools/c-analyzer/c_parser/preprocessor/common.py +++ b/Tools/c-analyzer/c_parser/preprocessor/common.py @@ -6,7 +6,6 @@ import subprocess import sys -from ..info import FileInfo, SourceLine from .errors import ( PreprocessorFailure, ErrorDirectiveError, diff --git a/Tools/c-analyzer/distutils/util.py b/Tools/c-analyzer/distutils/util.py index f687a28ec2f40e..c8e92658d95366 100644 --- a/Tools/c-analyzer/distutils/util.py +++ b/Tools/c-analyzer/distutils/util.py @@ -8,7 +8,6 @@ import re import string import sys -from distutils.errors import DistutilsPlatformError def get_host_platform(): """Return a string that identifies the current platform. This is used mainly to diff --git a/Tools/cases_generator/generators_common.py b/Tools/cases_generator/generators_common.py index bdc4324b670200..8c66ad4885ccfc 100644 --- a/Tools/cases_generator/generators_common.py +++ b/Tools/cases_generator/generators_common.py @@ -7,14 +7,12 @@ analysis_error, Label, CodeSection, - Uop, ) from cwriter import CWriter from typing import Callable, TextIO, Iterator, Iterable from lexer import Token from stack import Storage, StackError from parser import Stmt, SimpleStmt, BlockStmt, IfStmt, ForStmt, WhileStmt, MacroIfStmt -from stack import PRINT_STACKS DEBUG = False class TokenIterator: diff --git a/Tools/cases_generator/opcode_metadata_generator.py b/Tools/cases_generator/opcode_metadata_generator.py index 21407ad7df1e9a..00f6804f1724b5 100644 --- a/Tools/cases_generator/opcode_metadata_generator.py +++ b/Tools/cases_generator/opcode_metadata_generator.py @@ -19,7 +19,6 @@ cflags, ) from cwriter import CWriter -from dataclasses import dataclass from typing import TextIO from stack import get_stack_effect diff --git a/Tools/cases_generator/parser.py b/Tools/cases_generator/parser.py index ccf8bf649520ff..aa6c0b1446fb76 100644 --- a/Tools/cases_generator/parser.py +++ b/Tools/cases_generator/parser.py @@ -20,7 +20,6 @@ MacroIfStmt, ) -import pprint CodeDef = InstDef | LabelDef diff --git a/Tools/cases_generator/tier1_generator.py b/Tools/cases_generator/tier1_generator.py index d2fa749e1417f5..ebc914a6837e2e 100644 --- a/Tools/cases_generator/tier1_generator.py +++ b/Tools/cases_generator/tier1_generator.py @@ -9,8 +9,6 @@ Analysis, Instruction, Uop, - Label, - CodeSection, Part, analyze_files, Skip, @@ -24,13 +22,9 @@ write_header, type_and_null, Emitter, - TokenIterator, - always_true, - emit_to, ) from cwriter import CWriter from typing import TextIO -from lexer import Token from stack import Local, Stack, StackError, get_stack_effect, Storage DEFAULT_OUTPUT = ROOT / "Python/generated_cases.c.h" diff --git a/Tools/inspection/benchmark_external_inspection.py b/Tools/inspection/benchmark_external_inspection.py index 8e367422a961da..b7aa0e5de7ed99 100644 --- a/Tools/inspection/benchmark_external_inspection.py +++ b/Tools/inspection/benchmark_external_inspection.py @@ -4,7 +4,6 @@ import sys import contextlib import tempfile -import os import argparse from _colorize import get_colors, can_colorize diff --git a/Tools/jit/_stencils.py b/Tools/jit/_stencils.py index e2ae3d988fc7ac..d4547dc8e8e3c1 100644 --- a/Tools/jit/_stencils.py +++ b/Tools/jit/_stencils.py @@ -2,7 +2,6 @@ import dataclasses import enum -import sys import typing import _schema diff --git a/Tools/peg_generator/pegen/grammar_parser.py b/Tools/peg_generator/pegen/grammar_parser.py index 4fa2739270773f..58638638c6aec4 100644 --- a/Tools/peg_generator/pegen/grammar_parser.py +++ b/Tools/peg_generator/pegen/grammar_parser.py @@ -1,13 +1,10 @@ #!/usr/bin/env python3.8 # @generated by pegen from metagrammar.gram -import ast -import sys -import tokenize from typing import Any, Optional -from pegen.parser import memoize, memoize_left_rec, logger, Parser +from pegen.parser import memoize, Parser from ast import literal_eval from pegen.grammar import ( @@ -17,7 +14,6 @@ Gather, Group, Item, - Lookahead, LookaheadOrCut, MetaTuple, MetaList, diff --git a/Tools/picklebench/memory_dos_impact.py b/Tools/picklebench/memory_dos_impact.py index 3bad6586c46943..0a7cef8668565c 100755 --- a/Tools/picklebench/memory_dos_impact.py +++ b/Tools/picklebench/memory_dos_impact.py @@ -24,7 +24,6 @@ import argparse import gc -import io import json import os import pickle @@ -32,11 +31,10 @@ import struct import subprocess import sys -import tempfile import tracemalloc from pathlib import Path from time import perf_counter -from typing import Any, Dict, List, Tuple, Optional +from typing import Any, Dict, List, Tuple # Configuration From c00a77d98e974ef37093e5e5faa9e705df17e928 Mon Sep 17 00:00:00 2001 From: Ivy Xu Date: Sat, 13 Jun 2026 22:18:23 +0800 Subject: [PATCH 2/4] Revert changes to `grammar_parser.py` --- Tools/peg_generator/pegen/grammar_parser.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Tools/peg_generator/pegen/grammar_parser.py b/Tools/peg_generator/pegen/grammar_parser.py index 58638638c6aec4..7e535052a9a34c 100644 --- a/Tools/peg_generator/pegen/grammar_parser.py +++ b/Tools/peg_generator/pegen/grammar_parser.py @@ -1,10 +1,13 @@ #!/usr/bin/env python3.8 # @generated by pegen from metagrammar.gram +import ast +import sys +import tokenize from typing import Any, Optional -from pegen.parser import memoize, Parser +from pegen.parser import memoize, memoize_left_rec, logger, Parser from ast import literal_eval from pegen.grammar import ( From caae4a802cb46b8d251987025d2383a062a30eda Mon Sep 17 00:00:00 2001 From: Ivy Xu Date: Sat, 13 Jun 2026 22:43:14 +0800 Subject: [PATCH 3/4] Revert changes to `grammar_parser.py` --- Tools/peg_generator/pegen/grammar_parser.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Tools/peg_generator/pegen/grammar_parser.py b/Tools/peg_generator/pegen/grammar_parser.py index 7e535052a9a34c..4fa2739270773f 100644 --- a/Tools/peg_generator/pegen/grammar_parser.py +++ b/Tools/peg_generator/pegen/grammar_parser.py @@ -17,6 +17,7 @@ Gather, Group, Item, + Lookahead, LookaheadOrCut, MetaTuple, MetaList, From c38a0cf4fd9fb47cdbd3c37b605aa18fd6bb7b1a Mon Sep 17 00:00:00 2001 From: Ivy Xu Date: Sat, 13 Jun 2026 23:28:04 +0800 Subject: [PATCH 4/4] Revert changes to `common.py` --- Tools/c-analyzer/c_parser/preprocessor/common.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Tools/c-analyzer/c_parser/preprocessor/common.py b/Tools/c-analyzer/c_parser/preprocessor/common.py index 3e557987c30cb2..06f8f4da62b224 100644 --- a/Tools/c-analyzer/c_parser/preprocessor/common.py +++ b/Tools/c-analyzer/c_parser/preprocessor/common.py @@ -6,6 +6,7 @@ import subprocess import sys +from ..info import FileInfo, SourceLine from .errors import ( PreprocessorFailure, ErrorDirectiveError,