mirror of
				https://github.com/python/cpython.git
				synced 2025-11-03 19:34:08 +00:00 
			
		
		
		
	Revert "bpo-32962: Fix test_gdb failure in debug build with -mcet -fcf-protection -O0 (GH-6754)" (#7723)
This reverts commit 9b7c74ca32.
			
			
This commit is contained in:
		
							parent
							
								
									a9d0b34a5c
								
							
						
					
					
						commit
						2f9cbaa8b2
					
				
					 2 changed files with 2 additions and 10 deletions
				
			
		| 
						 | 
					@ -162,11 +162,7 @@ class DebuggerTests(unittest.TestCase):
 | 
				
			||||||
            commands += ['set print entry-values no']
 | 
					            commands += ['set print entry-values no']
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if cmds_after_breakpoint:
 | 
					        if cmds_after_breakpoint:
 | 
				
			||||||
            # bpo-32962: When Python is compiled with -mcet -fcf-protection,
 | 
					            commands += cmds_after_breakpoint
 | 
				
			||||||
            # arguments are unusable before running the first instruction
 | 
					 | 
				
			||||||
            # of the function entry point. The 'next' command makes the
 | 
					 | 
				
			||||||
            # required first step.
 | 
					 | 
				
			||||||
            commands += ['next'] + cmds_after_breakpoint
 | 
					 | 
				
			||||||
        else:
 | 
					        else:
 | 
				
			||||||
            commands += ['backtrace']
 | 
					            commands += ['backtrace']
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -851,12 +847,9 @@ id(42)
 | 
				
			||||||
            id("first break point")
 | 
					            id("first break point")
 | 
				
			||||||
            l = MyList()
 | 
					            l = MyList()
 | 
				
			||||||
        ''')
 | 
					        ''')
 | 
				
			||||||
        # bpo-32962: same case as in get_stack_trace():
 | 
					 | 
				
			||||||
        # we need an additional 'next' command in order to read
 | 
					 | 
				
			||||||
        # arguments of the innermost function of the call stack.
 | 
					 | 
				
			||||||
        # Verify with "py-bt":
 | 
					        # Verify with "py-bt":
 | 
				
			||||||
        gdb_output = self.get_stack_trace(cmd,
 | 
					        gdb_output = self.get_stack_trace(cmd,
 | 
				
			||||||
                                          cmds_after_breakpoint=['break wrapper_call', 'continue', 'next', 'py-bt'])
 | 
					                                          cmds_after_breakpoint=['break wrapper_call', 'continue', 'py-bt'])
 | 
				
			||||||
        self.assertRegex(gdb_output,
 | 
					        self.assertRegex(gdb_output,
 | 
				
			||||||
                         r"<method-wrapper u?'__init__' of MyList object at ")
 | 
					                         r"<method-wrapper u?'__init__' of MyList object at ")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1 +0,0 @@
 | 
				
			||||||
Fixed test_gdb when Python is compiled with flags -mcet -fcf-protection -O0.
 | 
					 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue