mirror of
				https://github.com/python/cpython.git
				synced 2025-11-04 07:31:38 +00:00 
			
		
		
		
	GH-108614: Remove non-debug uses of #if TIER_ONE and #if TIER_TWO from _POP_FRAME op. (GH-108685)
				
					
				
			This commit is contained in:
		
							parent
							
								
									194c6fb85e
								
							
						
					
					
						commit
						059bd4d299
					
				
					 7 changed files with 123 additions and 66 deletions
				
			
		
							
								
								
									
										23
									
								
								Python/executor_cases.c.h
									
										
									
										generated
									
									
									
								
							
							
						
						
									
										23
									
								
								Python/executor_cases.c.h
									
										
									
										generated
									
									
									
								
							| 
						 | 
				
			
			@ -690,24 +690,25 @@
 | 
			
		|||
            retval = stack_pointer[-1];
 | 
			
		||||
            STACK_SHRINK(1);
 | 
			
		||||
            assert(EMPTY());
 | 
			
		||||
            _PyFrame_SetStackPointer(frame, stack_pointer);
 | 
			
		||||
            _Py_LeaveRecursiveCallPy(tstate);
 | 
			
		||||
            // GH-99729: We need to unlink the frame *before* clearing it:
 | 
			
		||||
            _PyInterpreterFrame *dying = frame;
 | 
			
		||||
            #if TIER_ONE
 | 
			
		||||
            assert(frame != &entry_frame);
 | 
			
		||||
            #endif
 | 
			
		||||
            STORE_SP();
 | 
			
		||||
            _Py_LeaveRecursiveCallPy(tstate);
 | 
			
		||||
            // GH-99729: We need to unlink the frame *before* clearing it:
 | 
			
		||||
            _PyInterpreterFrame *dying = frame;
 | 
			
		||||
            frame = tstate->current_frame = dying->previous;
 | 
			
		||||
            _PyEval_FrameClearAndPop(tstate, dying);
 | 
			
		||||
            frame->prev_instr += frame->return_offset;
 | 
			
		||||
            _PyFrame_StackPush(frame, retval);
 | 
			
		||||
            #if TIER_ONE
 | 
			
		||||
            goto resume_frame;
 | 
			
		||||
            #endif
 | 
			
		||||
            #if TIER_TWO
 | 
			
		||||
            stack_pointer = _PyFrame_GetStackPointer(frame);
 | 
			
		||||
            ip_offset = (_Py_CODEUNIT *)_PyFrame_GetCode(frame)->co_code_adaptive;
 | 
			
		||||
            #endif
 | 
			
		||||
            LOAD_SP();
 | 
			
		||||
            LOAD_IP();
 | 
			
		||||
#if LLTRACE && TIER_ONE
 | 
			
		||||
            lltrace = maybe_lltrace_resume_frame(frame, &entry_frame, GLOBALS());
 | 
			
		||||
            if (lltrace < 0) {
 | 
			
		||||
                goto exit_unwind;
 | 
			
		||||
            }
 | 
			
		||||
#endif
 | 
			
		||||
            break;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue