GeezerVison

Original file line number	Diff line number	Diff line change
Expand Up		@@ -23483,6 +23483,99 @@ def f(self):
		);
		}

		#[test]
		fn test_reraising_except_loop_break_tail_keeps_post_loop_borrows() {
		let code = compile_exec(
		"\
		def f(flag=1, count=0):
		value = 2
		while value:
		count += 1
		try:
		if flag and value == 1:
		flag -= 1
		break
		value -= 1
		continue
		except:
		raise
		return count > 2 or value != 1
		",
		);
		let f = find_code(&code, "f").expect("missing f code");
		let instructions: Vec<_> = f
		.instructions
		.iter()
		.filter(\|unit\| !matches!(unit.op, Instruction::Cache))
		.collect();
		let return_idx = instructions
		.iter()
		.position(\|unit\| matches!(unit.op, Instruction::ReturnValue))
		.expect("missing return");
		let tail = &instructions[return_idx.saturating_sub(12)..return_idx];

		let load_name = \|unit: &CodeUnit\| match unit.op {
		Instruction::LoadFast { var_num } \| Instruction::LoadFastBorrow { var_num } => {
		let arg = OpArg::new(u32::from(u8::from(unit.arg)));
		Some(f.varnames[usize::from(var_num.get(arg))].as_str())
		}
		_ => None,
		};
		for name in ["count", "value"] {
		assert!(
		tail.iter()
		.any(\|unit\| matches!(unit.op, Instruction::LoadFastBorrow { .. })
		&& load_name(unit) == Some(name)),
		"post-loop condition should borrow {name}, got tail={tail:?}"
		);
		assert!(
		!tail
		.iter()
		.any(\|unit\| matches!(unit.op, Instruction::LoadFast { .. })
		&& load_name(unit) == Some(name)),
		"post-loop condition should not deopt {name} to LOAD_FAST, got tail={tail:?}"
		);
		}
		}

		#[test]
		fn test_try_except_continue_keeps_try_line_nop_before_continue_jump() {
		let code = compile_exec(
		"\
		def f(done=False):
		while not done:
		done = True
		try:
		continue
		except:
		done = False
		return done
		",
		);
		let f = find_code(&code, "f").expect("missing f code");
		let instructions: Vec<_> = f
		.instructions
		.iter()
		.filter(\|unit\| !matches!(unit.op, Instruction::Cache))
		.collect();
		assert!(
		instructions.windows(2).any(\|window\| matches!(
		window,
		[
		CodeUnit {
		op: Instruction::Nop,
		..
		},
		CodeUnit {
		op: Instruction::JumpBackward { .. },
		..
		}
		]
		)),
		"try/except continue should keep CPython-style try-line NOP before continue jump, got instructions={instructions:?}"
		);
		}

		#[test]
		fn test_handler_resume_before_later_loop_keeps_borrowed_tail_loads() {
		let code = compile_exec(
Expand Down

24 changes: 19 additions & 5 deletions 24 crates/codegen/src/ir.rs

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -5184,6 +5184,13 @@ impl CodeInfo {
		})
		}

		fn block_jumps_unconditionally_to(block: &Block, target: BlockIdx) -> bool {
		block
		.instructions
		.iter()
		.any(\|info\| info.target == target && info.instr.is_unconditional_jump())
		}

		fn handler_chain_has_explicit_reraise(blocks: &[Block], handler: BlockIdx) -> bool {
		let mut cursor = handler;
		let mut visited = vec![false; blocks.len()];
Expand Down Expand Up		@@ -5409,6 +5416,9 @@ impl CodeInfo {
		if block_jumps_backward_to(pred_block, BlockIdx::new(idx as u32)) {
		continue;
		}
		if block_jumps_unconditionally_to(pred_block, BlockIdx::new(idx as u32)) {
		continue;
		}
		let handlers = nonresuming_reraise_handlers(&self.blocks, pred_block);
		follows_protected_body[idx] = !handlers.is_empty()
		&& !handlers.iter().any(\|handler\| {
Expand Down Expand Up		@@ -7866,6 +7876,7 @@ impl CodeInfo {
		let mut predecessors = vec![Vec::new(); self.blocks.len()];
		let mut is_handler_resume_block = vec![false; self.blocks.len()];
		for (pred_idx, block) in self.blocks.iter().enumerate() {
		let block_idx = BlockIdx::new(pred_idx as u32);
		if block
		.instructions
		.iter()
Expand All		@@ -7876,12 +7887,12 @@ impl CodeInfo {
		{
		is_handler_resume_block[pred_idx] = true;
		}
		if block.next != BlockIdx::NULL {
		predecessors[block.next.idx()].push(BlockIdx::new(pred_idx as u32));
		if block_has_fallthrough(block) && block.next != BlockIdx::NULL {
		predecessors[block.next.idx()].push(block_idx);
		}
		for info in &block.instructions {
		if info.target != BlockIdx::NULL {
		predecessors[info.target.idx()].push(BlockIdx::new(pred_idx as u32));
		predecessors[info.target.idx()].push(block_idx);
		}
		}
		}
Expand Down Expand Up		@@ -12309,8 +12320,11 @@ fn remove_redundant_nops_in_blocks(blocks: &mut [Block]) -> usize {
		} else if src_instructions[src + 1].instr.is_unconditional_jump()
		&& src_instructions[src + 1].target != block_idx
		{
		src_instructions[src + 1].lineno_override = Some(lineno);
		remove = true;
		let next_lineno = instruction_lineno(&src_instructions[src + 1]);
		if next_lineno == lineno \|\| next_lineno < 0 {
		src_instructions[src + 1].lineno_override = Some(lineno);
		remove = true;
		}
		} else if src_instructions[src + 1].folded_from_nonliteral_expr {
		remove = true;
		} else {
Expand Down

Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.