From ed2853d2c82d7286ba510c8f65049d6f649017f0 Mon Sep 17 00:00:00 2001 From: Raphael Isemann Date: Thu, 26 Nov 2020 09:40:02 +0100 Subject: [PATCH] Reland [lldb] Fix TestThreadStepOut.py after "Flush local value map on every instruction" The original patch got reverted as a dependency of cf1c774d6ace59c5adc9ab71b31e . That patch got relanded so it's also necessary to reland this patch. Original summary: After cf1c774d6ace59c5adc9ab71b31e762c1be695b1, Clang seems to generate code that is more similar to icc/Clang, so we can use the same line numbers for all compilers in this test. --- .../test/API/functionalities/thread/step_out/TestThreadStepOut.py | 8 ++------ lldb/test/API/functionalities/thread/step_out/main.cpp | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/lldb/test/API/functionalities/thread/step_out/TestThreadStepOut.py b/lldb/test/API/functionalities/thread/step_out/TestThreadStepOut.py index e273cc4b..2ab36b5 100644 --- a/lldb/test/API/functionalities/thread/step_out/TestThreadStepOut.py +++ b/lldb/test/API/functionalities/thread/step_out/TestThreadStepOut.py @@ -70,12 +70,8 @@ class ThreadStepOutTestCase(TestBase): self.bkpt_string = '// Set breakpoint here' self.breakpoint = line_number('main.cpp', self.bkpt_string) - if "gcc" in self.getCompiler() or self.isIntelCompiler(): - self.step_out_destination = line_number( - 'main.cpp', '// Expect to stop here after step-out (icc and gcc)') - else: - self.step_out_destination = line_number( - 'main.cpp', '// Expect to stop here after step-out (clang)') + self.step_out_destination = line_number( + 'main.cpp', '// Expect to stop here after step-out.') def step_out_single_thread_with_cmd(self): self.step_out_with_cmd("this-thread") diff --git a/lldb/test/API/functionalities/thread/step_out/main.cpp b/lldb/test/API/functionalities/thread/step_out/main.cpp index 14d8401..e7dd230 100644 --- a/lldb/test/API/functionalities/thread/step_out/main.cpp +++ b/lldb/test/API/functionalities/thread/step_out/main.cpp @@ -19,10 +19,10 @@ thread_func () pseudo_barrier_wait(g_barrier); // Do something - step_out_of_here(); // Expect to stop here after step-out (clang) + step_out_of_here(); // Return - return NULL; // Expect to stop here after step-out (icc and gcc) + return NULL; // Expect to stop here after step-out. } int main () -- 2.7.4