Skip to content

Remove BEFORE_WITH,BINARY_SUBSCR #6822

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

Merged
youknowone merged 1 commit into from
Jan 20, 2026
Merged

Remove BEFORE_WITH,BINARY_SUBSCR #6822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions .cspell.dict/cpython.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ fromlist
heaptype
HIGHRES
IMMUTABLETYPE
INCREF
inplace
ismine
Itertool
keeped
Expand All @@ -39,6 +41,7 @@ kwonlyarg
kwonlyargs
lasti
linearise
Lshift
lsprof
maxdepth
mult
Expand All @@ -62,12 +65,15 @@ pyrepl
pythonw
PYTHREAD_NAME
releasebuffer
repr
Rshift
SA_ONSTACK
SOABI
stackdepth
stginfo
stringlib
structseq
subscr
subkwargs
subparams
swappedbytes
Expand Down
4 changes: 0 additions & 4 deletions Lib/_opcode_metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,10 +212,6 @@
'UNPACK_SEQUENCE_LIST': 209,
'UNPACK_SEQUENCE_TUPLE': 210,
'UNPACK_SEQUENCE_TWO_TUPLE': 211,
'BEFORE_ASYNC_WITH': 212,
'BEFORE_WITH': 213,
'BINARY_SUBSCR': 214,
'BUILD_CONST_KEY_MAP': 215,
'INSTRUMENTED_END_FOR': 234,
'INSTRUMENTED_POP_ITER': 235,
'INSTRUMENTED_END_SEND': 236,
Expand Down
71 changes: 63 additions & 8 deletions crates/codegen/src/compile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ use rustpython_compiler_core::{
bytecode::{
self, AnyInstruction, Arg as OpArgMarker, BinaryOperator, BuildSliceArgCount, CodeObject,
ComparisonOperator, ConstantData, ConvertValueOparg, Instruction, IntrinsicFunction1,
Invert, OpArg, OpArgType, PseudoInstruction, UnpackExArgs,
Invert, OpArg, OpArgType, PseudoInstruction, SpecialMethod, UnpackExArgs,
},
};
use rustpython_wtf8::Wtf8Buf;
Expand Down Expand Up @@ -489,7 +489,12 @@ impl Compiler {
match ctx {
ast::ExprContext::Load => {
emit!(self, Instruction::BuildSlice { argc });
emit!(self, Instruction::BinarySubscr);
emit!(
self,
Instruction::BinaryOp {
op: BinaryOperator::Subscr
}
);
}
ast::ExprContext::Store => {
emit!(self, Instruction::BuildSlice { argc });
Expand All @@ -503,7 +508,12 @@ impl Compiler {

// Emit appropriate instruction based on context
match ctx {
ast::ExprContext::Load => emit!(self, Instruction::BinarySubscr),
ast::ExprContext::Load => emit!(
self,
Instruction::BinaryOp {
op: BinaryOperator::Subscr
}
),
ast::ExprContext::Store => emit!(self, Instruction::StoreSubscr),
ast::ExprContext::Del => emit!(self, Instruction::DeleteSubscr),
ast::ExprContext::Invalid => {
Expand Down Expand Up @@ -4680,20 +4690,55 @@ impl Compiler {
let exc_handler_block = self.new_block();
let after_block = self.new_block();

// Compile context expression and BEFORE_WITH
// Compile context expression and load __enter__/__exit__ methods
self.compile_expression(&item.context_expr)?;
self.set_source_range(with_range);

// Stack: [cm]
emit!(self, Instruction::Copy { index: 1_u32 }); // [cm, cm]

if is_async {
if self.ctx.func != FunctionContext::AsyncFunction {
return Err(self.error(CodegenErrorType::InvalidAsyncWith));
}
emit!(self, Instruction::BeforeAsyncWith);
// Load __aexit__ and __aenter__, then call __aenter__
emit!(
self,
Instruction::LoadSpecial {
method: SpecialMethod::AExit
}
); // [cm, bound_aexit]
emit!(self, Instruction::Swap { index: 2_u32 }); // [bound_aexit, cm]
emit!(
self,
Instruction::LoadSpecial {
method: SpecialMethod::AEnter
}
); // [bound_aexit, bound_aenter]
// bound_aenter is already bound, call with NULL self_or_null
emit!(self, Instruction::PushNull); // [bound_aexit, bound_aenter, NULL]
emit!(self, Instruction::Call { nargs: 0 }); // [bound_aexit, awaitable]
emit!(self, Instruction::GetAwaitable);
self.emit_load_const(ConstantData::None);
self.compile_yield_from_sequence(true)?;
} else {
emit!(self, Instruction::BeforeWith);
// Load __exit__ and __enter__, then call __enter__
emit!(
self,
Instruction::LoadSpecial {
method: SpecialMethod::Exit
}
); // [cm, bound_exit]
emit!(self, Instruction::Swap { index: 2_u32 }); // [bound_exit, cm]
emit!(
self,
Instruction::LoadSpecial {
method: SpecialMethod::Enter
}
); // [bound_exit, bound_enter]
// bound_enter is already bound, call with NULL self_or_null
emit!(self, Instruction::PushNull); // [bound_exit, bound_enter, NULL]
emit!(self, Instruction::Call { nargs: 0 }); // [bound_exit, enter_result]
}

// Stack: [..., __exit__, enter_result]
Expand Down Expand Up @@ -5179,7 +5224,12 @@ impl Compiler {
);
}
// Use BINARY_OP/NB_SUBSCR to extract the element.
emit!(self, Instruction::BinarySubscr);
emit!(
self,
Instruction::BinaryOp {
op: BinaryOperator::Subscr
}
);
// Compile the subpattern in irrefutable mode.
self.compile_pattern_subpattern(pattern, pc)?;
}
Expand Down Expand Up @@ -6206,7 +6256,12 @@ impl Compiler {
self.compile_expression(slice)?;
emit!(self, Instruction::Copy { index: 2_u32 });
emit!(self, Instruction::Copy { index: 2_u32 });
emit!(self, Instruction::BinarySubscr);
emit!(
self,
Instruction::BinaryOp {
op: BinaryOperator::Subscr
}
);
AugAssignKind::Subscript
}
ast::Expr::Attribute(ast::ExprAttribute { value, attr, .. }) => {
Expand Down
Loading
Loading