[Lldb-commits] [lldb] 6951fe3 - [arm64] Remove an old special case that's not needed anymore.

[Davide Italiano via lldb-commits]

Author: Davide Italiano
Date: 2020-05-04T14:18:51-07:00
New Revision: 6951fe3989343c6605c397ac427acea4e39d2132

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

LOG: [arm64] Remove an old special case that's not needed anymore.

Debug info generation & codegen now steps onto the correct line.

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 2d9632eb2dd6..eb2d264ec2e3 100644
--- a/lldb/test/API/functionalities/thread/step_out/TestThreadStepOut.py
+++ b/lldb/test/API/functionalities/thread/step_out/TestThreadStepOut.py
@@ -70,9 +70,9 @@ 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() or self.getArchitecture() in ['arm64', 'arm64e']:
+        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; arm64)')
+                '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)')

diff  --git a/lldb/test/API/functionalities/thread/step_out/main.cpp b/lldb/test/API/functionalities/thread/step_out/main.cpp
index 76818fff925a..14d84010de8a 100644
--- a/lldb/test/API/functionalities/thread/step_out/main.cpp
+++ b/lldb/test/API/functionalities/thread/step_out/main.cpp
@@ -22,7 +22,7 @@ thread_func ()
     step_out_of_here(); // Expect to stop here after step-out (clang)
 
     // Return
-    return NULL;  // Expect to stop here after step-out (icc and gcc; arm64)
+    return NULL;  // Expect to stop here after step-out (icc and gcc)
 }
 
 int main ()