[llvm-branch-commits] [lldb] ed2853d - Reland [lldb] Fix TestThreadStepOut.py after "Flush local value map on every instruction"

[Raphael Isemann via llvm-branch-commits]

Author: Raphael Isemann
Date: 2021-01-21T13:35:13+01:00
New Revision: ed2853d2c82d7286ba510c8f65049d6f649017f0

URL: https://github.com/llvm/llvm-project/commit/ed2853d2c82d7286ba510c8f65049d6f649017f0
DIFF: https://github.com/llvm/llvm-project/commit/ed2853d2c82d7286ba510c8f65049d6f649017f0.diff

LOG: 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.

Added: 
    

Modified: 
    lldb/test/API/functionalities/thread/step_out/TestThreadStepOut.py
    lldb/test/API/functionalities/thread/step_out/main.cpp

Removed: 
    


################################################################################
diff  --git a/lldb/test/API/functionalities/thread/step_out/TestThreadStepOut.py b/lldb/test/API/functionalities/thread/step_out/TestThreadStepOut.py
index e273cc4be31b..2ab36b57eaee 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 @@ def setUp(self):
         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 14d84010de8a..e7dd230d239c 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 ()